Move ExtensionAction from common/ to browser/.

chrome/browser/extensions/script_badge_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/script_badge_controller.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #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"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
@@ skipping 37 matching lines @@
 }
 
 LocationBarController::Action ScriptBadgeController::OnClicked(
     const std::string& extension_id, int mouse_button) {
   ExtensionService* service = GetExtensionService();
   if (!service)
     return ACTION_NONE;
 
   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) {
     case 1:    // left
     case 2: {  // middle
       TabContents* tab_contents = TabContents::FromWebContents(web_contents());
       tab_contents->extension_tab_helper()->active_tab_permission_manager()->
           GrantIfRequested(extension);
 
       // Even if clicking the badge doesn't immediately cause the extension to
@@ skipping 146 matching lines @@
     return NULL;
 
   ExtensionService* service = GetExtensionService();
   if (!service)
     return NULL;
 
   const Extension* extension = service->extensions()->GetByID(extension_id);
   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;
 }
 
 bool ScriptBadgeController::MarkExtensionExecuting(
     const std::string& extension_id) {
   ExtensionAction* script_badge = AddExtensionToCurrentActions(extension_id);
   if (!script_badge)
     return false;
 
@@ skipping 23 matching lines @@
       current_actions_.erase(it);
       break;
     }
   }
 
   CHECK_EQ(size_before, current_actions_.size() + 1);
   return true;
 }
 
 }  // namespace extensions