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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/tab_helper.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
« chrome/browser/extensions/extension_service.cc ('K') | « chrome/browser/extensions/script_badge_controller.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('j') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/tab_helper.cc
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index 48291c6c539dd83786ca30d95c83810468084390..a38cfcc7be0fad023af7830033e3c5527a8b3e44 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -19,7 +19,7 @@
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_action.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/extensions/extension_messages.h"
@@ -160,7 +160,7 @@ void TabHelper::DidNavigateMainFrame(
for (ExtensionSet::const_iterator it = service->extensions()->begin();
it != service->extensions()->end(); ++it) {
- ExtensionAction* browser_action = (*it)->browser_action();
+ ExtensionAction* browser_action = GetBrowserAction(profile, **it);
if (browser_action) {
browser_action->ClearAllValuesForTab(
SessionID::IdForTab(tab_contents_->web_contents()));
« chrome/browser/extensions/extension_service.cc ('K') | « chrome/browser/extensions/script_badge_controller.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('j') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698