Move ExtensionAction from common/ to browser/.

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/common/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/common/badge_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/animation/animation_delegate.h"
@@ skipping 203 matching lines @@
       observer_(observer) {
   if (icon_animation.get())
     icon_animation->AddObserver(observer);
 }
 
 ExtensionAction::IconAnimation::ScopedObserver::~ScopedObserver() {
   if (icon_animation_.get())
     icon_animation_->RemoveObserver(observer_);
 }
 
-ExtensionAction::ExtensionAction(const std::string& extension_id,
-                                 Type action_type)
+ExtensionAction::ExtensionAction(
+    const std::string& extension_id,
+    const extensions::Extension::ActionInfo& manifest_info)
     : extension_id_(extension_id),
-      action_type_(action_type),
+      action_type_(manifest_info.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 ?
+      ACTIVE : INVISIBLE);
+  set_default_icon_path(manifest_info.default_icon_path);
+  set_id(manifest_info.id);
+  if (!manifest_info.default_title.empty())
+    SetTitle(ExtensionAction::kDefaultTabId, manifest_info.default_title);
+  if (!manifest_info.default_popup_url.is_empty()) {
+    SetPopupUrl(ExtensionAction::kDefaultTabId,
+                manifest_info.default_popup_url);
+  }
 }
 
 ExtensionAction::~ExtensionAction() {
 }
 
 scoped_ptr<ExtensionAction> ExtensionAction::CopyForTest() const {
+
   scoped_ptr<ExtensionAction> copy(
-      new ExtensionAction(extension_id_, action_type_));
+      new ExtensionAction(extension_id_,
+                          extensions::Extension::ActionInfo(action_type_)));
   copy->popup_url_ = popup_url_;
   copy->title_ = title_;
   copy->icon_ = icon_;
   copy->icon_index_ = icon_index_;
   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->default_icon_path_ = default_icon_path_;
@@ skipping 257 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));
 }
+
+namespace extensions {
+
+ExtensionAction* GetBrowserAction(Profile* profile,
+                                  const Extension& extension) {
+  return ExtensionSystem::Get(profile)->extension_service()->
+      GetBrowserAction(extension);
+}
+ExtensionAction* GetPageAction(Profile* profile, const Extension& extension) {
+  return ExtensionSystem::Get(profile)->extension_service()->
+      GetPageAction(extension);
+}
+ExtensionAction* GetScriptBadge(Profile* profile, const Extension& extension) {
+  return ExtensionSystem::Get(profile)->extension_service()->
+      GetScriptBadge(extension);
+}
+
+}