Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1919)

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.h

Issue 667483004: Ifdef extensions usage in RendererContextMenu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/renderer_context_menu/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_context_menu/render_view_context_menu.h
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
index ebacb0e801ff0fc85219a4119df6a891e06727e9..6f7d044f9ab387e656f15056e60543314e6774c0 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -12,8 +12,6 @@
#include "base/observer_list.h"
#include "base/strings/string16.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/extensions/context_menu_matcher.h"
-#include "chrome/browser/extensions/menu_manager.h"
#include "components/renderer_context_menu/context_menu_content_type.h"
#include "components/renderer_context_menu/render_view_context_menu_base.h"
#include "components/renderer_context_menu/render_view_context_menu_observer.h"
@@ -22,6 +20,11 @@
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/window_open_disposition.h"
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/context_menu_matcher.h"
+#include "chrome/browser/extensions/menu_manager.h"
+#endif
+
class PrintPreviewContextMenuObserver;
class Profile;
class SpellingMenuObserver;
@@ -60,7 +63,10 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
protected:
Profile* GetProfile();
+
+#if defined(ENABLE_EXTENSIONS)
extensions::ContextMenuMatcher extension_items_;
+#endif
private:
friend class RenderViewContextMenuTest;
@@ -68,12 +74,14 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
static bool IsDevToolsURL(const GURL& url);
static bool IsInternalResourcesURL(const GURL& url);
+#if defined(ENABLE_EXTENSIONS)
static bool ExtensionContextAndPatternMatch(
const content::ContextMenuParams& params,
const extensions::MenuItem::ContextList& contexts,
const extensions::URLPatternSet& target_url_patterns);
static bool MenuItemMatchesParams(const content::ContextMenuParams& params,
const extensions::MenuItem* item);
+#endif
// RenderViewContextMenuBase:
void InitMenu() override;
@@ -105,8 +113,10 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
void AppendRotationItems();
void AppendEditableItems();
void AppendSearchProvider();
+#if defined(ENABLE_EXTENSIONS)
void AppendAllExtensionItems();
void AppendCurrentExtensionItems();
+#endif
void AppendPrintPreviewItems();
void AppendSearchWebForImageItems();
void AppendSpellingSuggestionsSubMenu();
« no previous file with comments | « no previous file | chrome/browser/renderer_context_menu/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698