Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

chrome/browser/extensions/api/extension_action/extension_actions_api.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/api/extension_action/extension_actions_api.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/state_store.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/error_utils.h"
 
 namespace {
 
 const char kBrowserActionStorageKey[] = "browser_action";
 const char kPopupUrlStorageKey[] = "poupup_url";
 const char kTitleStorageKey[] = "title";
@@ skipping 278 matching lines @@
   if (tab_id_ != ExtensionAction::kDefaultTabId) {
     ExtensionTabUtil::GetTabById(
         tab_id_, profile(), include_incognito(), NULL, NULL, &contents_, NULL);
     if (!contents_) {
       error_ = extensions::ErrorUtils::FormatErrorMessage(
           kNoTabError, base::IntToString(tab_id_));
       return false;
     }
   } else {
     // Only browser actions and system indicators have a default tabId.
-    typedef extensions::Extension::ActionInfo ActionInfo;
-    ActionInfo::Type action_type = extension_action_->action_type();
+    extensions::ActionInfo::Type action_type = extension_action_->action_type();
     EXTENSION_FUNCTION_VALIDATE(
-        action_type == ActionInfo::TYPE_BROWSER ||
-        action_type == ActionInfo::TYPE_SYSTEM_INDICATOR);
+        action_type == extensions::ActionInfo::TYPE_BROWSER ||
+        action_type == extensions::ActionInfo::TYPE_SYSTEM_INDICATOR);
   }
   return RunExtensionAction();
 }
 
 bool ExtensionActionFunction::ExtractDataFromArguments() {
   // There may or may not be details (depends on the function).
   // The tabId might appear in details (if it exists), as the first
   // argument besides the action type (depends on the function), or be omitted
   // entirely.
   base::Value* first_arg = NULL;
@@ skipping 33 matching lines @@
 
     default:
       return false;
   }
 
   return true;
 }
 
 void ExtensionActionFunction::NotifyChange() {
   switch (extension_action_->action_type()) {
-    case extensions::Extension::ActionInfo::TYPE_BROWSER:
-    case extensions::Extension::ActionInfo::TYPE_PAGE:
+    case extensions::ActionInfo::TYPE_BROWSER:
+    case extensions::ActionInfo::TYPE_PAGE:
       if (extensions::ExtensionActionManager::Get(profile_)->
           GetBrowserAction(*extension_)) {
         NotifyBrowserActionChange();
       } else if (extensions::ExtensionActionManager::Get(profile_)->
                  GetPageAction(*extension_)) {
         NotifyLocationBarChange();
       }
       return;
-    case extensions::Extension::ActionInfo::TYPE_SCRIPT_BADGE:
+    case extensions::ActionInfo::TYPE_SCRIPT_BADGE:
       NotifyLocationBarChange();
       return;
-    case extensions::Extension::ActionInfo::TYPE_SYSTEM_INDICATOR:
+    case extensions::ActionInfo::TYPE_SYSTEM_INDICATOR:
       NotifySystemIndicatorChange();
       return;
   }
   NOTREACHED();
 }
 
 void ExtensionActionFunction::NotifyBrowserActionChange() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
       content::Source<ExtensionAction>(extension_action_),
@@ skipping 178 matching lines @@
 bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() {
   ListValue* list = new ListValue();
   SkColor color = extension_action_->GetBadgeBackgroundColor(tab_id_);
   list->Append(Value::CreateIntegerValue(SkColorGetR(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetG(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetB(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetA(color)));
   SetResult(list);
   return true;
 }