Move Extension into extensions namespace

chrome/browser/ui/views/browser_actions_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 15 matching lines @@
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/tween.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/resize_area_delegate.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/view.h"
 
 class Browser;
 class BrowserActionsContainer;
-class Extension;
 class ExtensionAction;
 class ExtensionPopup;
 class PrefService;
 class Profile;
 
+namespace extensions {
+class Extension;
+}
+
 namespace ui {
 class SlideAnimation;
 }
 
 namespace views {
 class MenuItemView;
 class ResizeArea;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 // The BrowserActionButton is a specialization of the MenuButton class.
 // It acts on a ExtensionAction, in this case a BrowserAction and handles
 // loading the image for the button asynchronously on the file thread.
 class BrowserActionButton : public views::MenuButton,
                             public views::ButtonListener,
                             public ImageLoadingTracker::Observer,
                             public content::NotificationObserver {
  public:
-  BrowserActionButton(const Extension* extension,
+  BrowserActionButton(const extensions::Extension* extension,
                       BrowserActionsContainer* panel);
 
   // Call this instead of delete.
   void Destroy();
 
   ExtensionAction* browser_action() const { return browser_action_; }
-  const Extension* extension() { return extension_; }
+  const extensions::Extension* extension() { return extension_; }
 
   // Called to update the display to match the browser action's state.
   void UpdateState();
 
   // Returns the default icon, if any.
   const SkBitmap& default_icon() const { return default_icon_; }
 
   // Does this button's action have a popup?
   virtual bool IsPopup();
   virtual GURL GetPopupUrl();
@@ skipping 40 matching lines @@
                                     View* child) OVERRIDE;
 
  private:
   virtual ~BrowserActionButton();
 
   // The browser action this view represents. The ExtensionAction is not owned
   // by this class.
   ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
-  const Extension* extension_;
+  const extensions::Extension* extension_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously.
   ImageLoadingTracker tracker_;
 
   // The default icon for our browser action. This might be non-empty if the
   // browser action had a value for default_icon in the manifest.
   SkBitmap default_icon_;
 
   // The browser action shelf.
@@ skipping 14 matching lines @@
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView
 // A single section in the browser action container. This contains the actual
 // BrowserActionButton, as well as the logic to paint the badge.
 
 class BrowserActionView : public views::View {
  public:
-  BrowserActionView(const Extension* extension, BrowserActionsContainer* panel);
+  BrowserActionView(const extensions::Extension* extension,
+                    BrowserActionsContainer* panel);
   virtual ~BrowserActionView();
 
   BrowserActionButton* button() { return button_; }
 
   // Allocates a canvas object on the heap and draws into it the icon for the
   // view as well as the badge (if any). Caller is responsible for deleting the
   // returned object.
   gfx::Canvas* GetIconWithBadge();
 
   // Overridden from views::View:
@@ skipping 223 matching lines @@
 
   typedef std::vector<BrowserActionView*> BrowserActionViews;
 
   // Returns the width of an icon, optionally with its padding.
   static int IconWidth(bool include_padding);
 
   // Returns the height of an icon.
   static int IconHeight();
 
   // ExtensionToolbarModel::Observer implementation.
-  virtual void BrowserActionAdded(const Extension* extension,
+  virtual void BrowserActionAdded(const extensions::Extension* extension,
                                   int index) OVERRIDE;
-  virtual void BrowserActionRemoved(const Extension* extension) OVERRIDE;
-  virtual void BrowserActionMoved(const Extension* extension,
+  virtual void BrowserActionRemoved(
+      const extensions::Extension* extension) OVERRIDE;
+  virtual void BrowserActionMoved(const extensions::Extension* extension,
                                   int index) OVERRIDE;
   virtual void ModelLoaded() OVERRIDE;
 
   void LoadImages();
 
   // Sets the initial container width.
   void SetContainerWidth();
 
   // Closes the overflow menu if open.
   void CloseOverflowMenu();
@@ skipping 29 matching lines @@
 
   // Animate to the target size (unless testing, in which case we go straight to
   // the target size).  This also saves the target number of visible icons in
   // the pref if we're not incognito.
   void SaveDesiredSizeAndAnimate(ui::Tween::Type type,
                                  size_t num_visible_icons);
 
   // Returns true if this extension should be shown in this toolbar. This can
   // return false if we are in an incognito window and the extension is disabled
   // for incognito.
-  bool ShouldDisplayBrowserAction(const Extension* extension);
+  bool ShouldDisplayBrowserAction(const extensions::Extension* extension);
 
   // The vector of browser actions (icons/image buttons for each action). Note
   // that not every BrowserAction in the ToolbarModel will necessarily be in
   // this collection. Some extensions may be disabled in incognito windows.
   BrowserActionViews browser_action_views_;
 
   Profile* profile_;
 
   // The Browser object the container is associated with.
   Browser* browser_;
@@ skipping 47 matching lines @@
 
   base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_