Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

chrome/browser/extensions/extension_action.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/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 141 matching lines @@
     icon_animation->AddObserver(observer);
 }
 
 ExtensionAction::IconAnimation::ScopedObserver::~ScopedObserver() {
   if (icon_animation_.get())
     icon_animation_->RemoveObserver(observer_);
 }
 
 ExtensionAction::ExtensionAction(
     const std::string& extension_id,
-    extensions::Extension::ActionInfo::Type action_type,
-    const extensions::Extension::ActionInfo& manifest_data)
+    extensions::ActionInfo::Type action_type,
+    const extensions::ActionInfo& manifest_data)
     : extension_id_(extension_id),
       action_type_(action_type),
       has_changed_(false) {
   // Page/script actions are hidden/disabled by default, and browser actions are
   // visible/enabled by default.
   SetAppearance(kDefaultTabId,
-                action_type == extensions::Extension::ActionInfo::TYPE_BROWSER ?
+                action_type == extensions::ActionInfo::TYPE_BROWSER ?
                 ExtensionAction::ACTIVE : ExtensionAction::INVISIBLE);
   SetTitle(kDefaultTabId, manifest_data.default_title);
   SetPopupUrl(kDefaultTabId, manifest_data.default_popup_url);
   if (!manifest_data.default_icon.empty()) {
     set_default_icon(make_scoped_ptr(new ExtensionIconSet(
         manifest_data.default_icon)));
   }
   set_id(manifest_data.id);
 }
 
 ExtensionAction::~ExtensionAction() {
 }
 
 scoped_ptr<ExtensionAction> ExtensionAction::CopyForTest() const {
   scoped_ptr<ExtensionAction> copy(
       new ExtensionAction(extension_id_, action_type_,
-                          extensions::Extension::ActionInfo()));
+                          extensions::ActionInfo()));
   copy->popup_url_ = popup_url_;
   copy->title_ = title_;
   copy->icon_ = icon_;
   copy->badge_text_ = badge_text_;
   copy->badge_background_color_ = badge_background_color_;
   copy->badge_text_color_ = badge_text_color_;
   copy->appearance_ = appearance_;
   copy->icon_animation_ = icon_animation_;
   copy->id_ = id_;
 
   if (default_icon_.get())
     copy->default_icon_.reset(new ExtensionIconSet(*default_icon_));
 
   return copy.Pass();
 }
 
 // static
 int ExtensionAction::GetIconSizeForType(
-    extensions::Extension::ActionInfo::Type type) {
+    extensions::ActionInfo::Type type) {
   switch (type) {
-    case extensions::Extension::ActionInfo::TYPE_BROWSER:
-    case extensions::Extension::ActionInfo::TYPE_PAGE:
-    case extensions::Extension::ActionInfo::TYPE_SYSTEM_INDICATOR:
+    case extensions::ActionInfo::TYPE_BROWSER:
+    case extensions::ActionInfo::TYPE_PAGE:
+    case extensions::ActionInfo::TYPE_SYSTEM_INDICATOR:
       // TODO(dewittj) Report the actual icon size of the system
       // indicator.
       return extension_misc::EXTENSION_ICON_ACTION;
-    case extensions::Extension::ActionInfo::TYPE_SCRIPT_BADGE:
+    case extensions::ActionInfo::TYPE_SCRIPT_BADGE:
       return extension_misc::EXTENSION_ICON_BITTY;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 void ExtensionAction::SetPopupUrl(int tab_id, const GURL& url) {
   // We store |url| even if it is empty, rather than removing a URL from the
   // map.  If an extension has a default popup, and removes it for a tab via
@@ skipping 33 matching lines @@
   const Appearance old_appearance = GetValue(&appearance_, tab_id);
 
   if (old_appearance == new_appearance)
     return false;
 
   SetValue(&appearance_, tab_id, new_appearance);
 
   // When showing a script badge for the first time on a web page, fade it in.
   // Other transitions happen instantly.
   if (old_appearance == INVISIBLE && tab_id != kDefaultTabId &&
-      action_type_ == extensions::Extension::ActionInfo::TYPE_SCRIPT_BADGE) {
+      action_type_ == extensions::ActionInfo::TYPE_SCRIPT_BADGE) {
     RunIconAnimation(tab_id);
   }
 
   return true;
 }
 
 void ExtensionAction::ClearAllValuesForTab(int tab_id) {
   popup_url_.erase(tab_id);
   title_.erase(tab_id);
   icon_.erase(tab_id);
@@ skipping 96 matching lines @@
   icon_animation->Start();
   // After the icon is finished fading in (plus some padding to handle random
   // timer delays), destroy it. We use a delayed task so that the Animation is
   // deleted even if it hasn't finished by the time the MessageLoop is
   // destroyed.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DestroyIconAnimation, base::Passed(icon_animation.Pass())),
       base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2));
 }