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

Unified Diff: chrome/browser/extensions/script_badge_controller.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/script_badge_controller.cc
diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
index 3a2ef2b23c04007ad71380d543099c731723bf4d..0db2cb5197da5e08c966dc72ea42cb198a2d83c6 100644
--- a/chrome/browser/extensions/script_badge_controller.cc
+++ b/chrome/browser/extensions/script_badge_controller.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_action.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/chrome_notification_types.h"
@@ -73,7 +73,7 @@ LocationBarController::Action ScriptBadgeController::OnClicked(
const Extension* extension = service->extensions()->GetByID(extension_id);
CHECK(extension);
- ExtensionAction* script_badge = extension->script_badge();
+ ExtensionAction* script_badge = service->GetScriptBadge(*extension);
CHECK(script_badge);
switch (mouse_button) {
@@ -240,7 +240,7 @@ ExtensionAction* ScriptBadgeController::AddExtensionToCurrentActions(
if (!extension)
return NULL;
- ExtensionAction* script_badge = extension->script_badge();
+ ExtensionAction* script_badge = service->GetScriptBadge(*extension);
current_actions_.push_back(script_badge);
return script_badge;
}

Powered by Google App Engine
This is Rietveld 408576698