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

Unified Diff: chrome/browser/extensions/extension_context_menu_model.cc

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof of concept Created 8 years, 3 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
Index: chrome/browser/extensions/extension_context_menu_model.cc
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index f80437d88fa27d7a3d4ce51219360a047dadb985..a646900134827f6fc827b8c995a2454d401f169d 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_context_menu_model.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
@@ -14,7 +15,6 @@
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_action.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -159,9 +159,9 @@ ExtensionContextMenuModel::~ExtensionContextMenuModel() {}
void ExtensionContextMenuModel::InitMenu(const Extension* extension) {
DCHECK(extension);
- extension_action_ = extension->browser_action();
+ extension_action_ = extensions::GetBrowserAction(profile_, *extension);
if (!extension_action_)
- extension_action_ = extension->page_action();
+ extension_action_ = extensions::GetPageAction(profile_, *extension);
AddItem(NAME, UTF8ToUTF16(extension->name()));
AddSeparator(ui::NORMAL_SEPARATOR);

Powered by Google App Engine
This is Rietveld 408576698