diff options
Diffstat (limited to 'WebCore/page/ContextMenuController.cpp')
| -rw-r--r-- | WebCore/page/ContextMenuController.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/WebCore/page/ContextMenuController.cpp b/WebCore/page/ContextMenuController.cpp index 0ec9d1c..1cf0014 100644 --- a/WebCore/page/ContextMenuController.cpp +++ b/WebCore/page/ContextMenuController.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "ContextMenuController.h" +#if ENABLE(CONTEXT_MENUS) + #include "Chrome.h" #include "ContextMenu.h" #include "ContextMenuClient.h" @@ -95,8 +97,10 @@ void ContextMenuController::handleContextMenuEvent(Event* event) m_contextMenu.set(new ContextMenu(result)); m_contextMenu->populate(); +#if ENABLE(INSPECTOR) if (m_page->inspectorController()->enabled()) m_contextMenu->addInspectElementItem(); +#endif PlatformMenuDescription customMenu = m_client->getCustomMenuFromDefaultItems(m_contextMenu.get()); m_contextMenu->setPlatformDescription(customMenu); @@ -162,10 +166,12 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item) frame->editor()->copy(); break; case ContextMenuItemTagGoBack: - frame->loader()->goBackOrForward(-1); + if (Page* page = frame->page()) + page->goBackOrForward(-1); break; case ContextMenuItemTagGoForward: - frame->loader()->goBackOrForward(1); + if (Page* page = frame->page()) + page->goBackOrForward(1); break; case ContextMenuItemTagStop: frame->loader()->stop(); @@ -325,13 +331,17 @@ void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item) frame->editor()->changeBackToReplacedString(result.replacedString()); break; #endif +#if ENABLE(INSPECTOR) case ContextMenuItemTagInspectElement: if (Page* page = frame->page()) page->inspectorController()->inspect(result.innerNonSharedNode()); break; +#endif default: break; } } } // namespace WebCore + +#endif // ENABLE(CONTEXT_MENUS) |