Move Extension into extensions namespace
BUG=117262
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10375021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 43c52e6..d7640f4 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -21,6 +21,10 @@
@class NSMenu;
@class NSWindow;
+namespace extensions {
+class Extension;
+}
+
// An implementation of BrowserWindow for Cocoa. Bridges between C++ and
// the Cocoa NSWindow. Cross-platform code will interact with this object when
// it needs to manipulate the window.
@@ -123,7 +127,7 @@
TabContentsWrapper* tab_contents) OVERRIDE;
virtual void ShowCreateChromeAppShortcutsDialog(
Profile* profile,
- const Extension* app) OVERRIDE;
+ const extensions::Extension* app) OVERRIDE;
virtual void Cut() OVERRIDE;
virtual void Copy() OVERRIDE;
virtual void Paste() OVERRIDE;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 4e01a62..c0bf3ce 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -547,7 +547,7 @@
}
void BrowserWindowCocoa::ShowCreateChromeAppShortcutsDialog(
- Profile* profile, const Extension* app) {
+ Profile* profile, const extensions::Extension* app) {
NOTIMPLEMENTED();
}
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.h b/chrome/browser/ui/cocoa/extensions/browser_action_button.h
index e8bad88..1b4eceb 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.h
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.h
@@ -12,11 +12,14 @@
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/gradient_button_cell.h"
-class Extension;
class ExtensionAction;
class ExtensionImageTrackerBridge;
class Profile;
+namespace extensions {
+class Extension;
+}
+
// Fired when the Browser Action's state has changed. Usually the image needs to
// be updated.
extern NSString* const kBrowserActionButtonUpdatedNotification;
@@ -42,7 +45,7 @@
scoped_nsobject<NSViewAnimation> moveAnimation_;
// The extension for this button. Weak.
- const Extension* extension_;
+ const extensions::Extension* extension_;
// The ID of the active tab.
int tabId_;
@@ -57,7 +60,7 @@
}
- (id)initWithFrame:(NSRect)frame
- extension:(const Extension*)extension
+ extension:(const extensions::Extension*)extension
profile:(Profile*)profile
tabId:(int)tabId;
@@ -76,7 +79,7 @@
- (NSImage*)compositedImage;
@property(readonly, nonatomic) BOOL isBeingDragged;
-@property(readonly, nonatomic) const Extension* extension;
+@property(readonly, nonatomic) const extensions::Extension* extension;
@property(readwrite, nonatomic) int tabId;
@end
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index 3c5617d..bdd25c7 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -29,6 +29,8 @@
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
#include "ui/gfx/size.h"
+using extensions::Extension;
+
NSString* const kBrowserActionButtonUpdatedNotification =
@"BrowserActionButtonUpdatedNotification";
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h
index 02a26d9..59001cd 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h
@@ -14,7 +14,6 @@
class Browser;
@class BrowserActionButton;
@class BrowserActionsContainerView;
-class Extension;
@class ExtensionPopupController;
class ExtensionToolbarModel;
class ExtensionServiceObserverBridge;
@@ -22,6 +21,10 @@
class PrefService;
class Profile;
+namespace extensions {
+class Extension;
+}
+
// Sent when the visibility of the Browser Actions changes.
extern NSString* const kBrowserActionVisibilityChangedNotification;
@@ -88,7 +91,8 @@
- (void)resizeContainerAndAnimate:(BOOL)animate;
// Returns the NSView for the action button associated with an extension.
-- (NSView*)browserActionViewForExtension:(const Extension*)extension;
+- (NSView*)browserActionViewForExtension:(
+ const extensions::Extension*)extension;
// Returns the saved width determined by the number of shown Browser Actions
// preference property. If no preference is found, then the width for the
@@ -98,7 +102,7 @@
// Returns where the popup arrow should point to for a given Browser Action. If
// it is passed an extension that is not a Browser Action, then it will return
// NSZeroPoint.
-- (NSPoint)popupPointForBrowserAction:(const Extension*)extension;
+- (NSPoint)popupPointForBrowserAction:(const extensions::Extension*)extension;
// Returns whether the chevron button is currently hidden or in the process of
// being hidden (fading out). Will return NO if it is not hidden or is in the
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index 046f2e53..a946a22 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -34,6 +34,9 @@
#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
#include "ui/gfx/mac/nsimage_cache.h"
+using extensions::Extension;
+using extensions::ExtensionList;
+
NSString* const kBrowserActionVisibilityChangedNotification =
@"BrowserActionVisibilityChangedNotification";
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h
index 8904fa8..addb655 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h
@@ -12,10 +12,13 @@
#include "base/memory/scoped_ptr.h"
class AsyncUninstaller;
-class Extension;
class ExtensionAction;
class Profile;
+namespace extensions {
+class Extension;
+}
+
namespace extension_action_context_menu {
} // namespace extension_action_context_menu
@@ -24,7 +27,7 @@
@interface ExtensionActionContextMenu : NSMenu {
@private
// The extension that this menu belongs to. Weak.
- const Extension* extension_;
+ const extensions::Extension* extension_;
// The extension action this menu belongs to. Weak.
ExtensionAction* action_;
@@ -38,7 +41,7 @@
}
// Initializes and returns a context menu for the given extension and profile.
-- (id)initWithExtension:(const Extension*)extension
+- (id)initWithExtension:(const extensions::Extension*)extension
profile:(Profile*)profile
extensionAction:(ExtensionAction*)action;
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
index 1b63043a..401481c 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
@@ -38,6 +38,7 @@
using content::OpenURLParams;
using content::Referrer;
using content::WebContents;
+using extensions::Extension;
// A class that loads the extension icon on the I/O thread before showing the
// confirmation dialog to uninstall the given extension.
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
index 6a58c94..9cab254 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
@@ -15,7 +15,6 @@
#include "chrome/browser/extensions/extension_install_ui.h"
#include "third_party/skia/include/core/SkBitmap.h"
-class Extension;
class Profile;
// Displays the extension or bundle install prompt, and notifies the
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
index 2daa7f1a..2e9b7d63 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
@@ -25,6 +25,7 @@
#include "ui/gfx/image/image.h"
#include "webkit/glue/image_decoder.h"
+using extensions::Extension;
// Base class for our tests.
class ExtensionInstallDialogControllerTest : public CocoaProfileTest {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
index 133beda..678f83c 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
@@ -28,7 +28,7 @@
// When an extension is installed on Mac with neither browser action nor
// page action icons, show an infobar instead of a popup bubble.
static void ShowGenericExtensionInstalledInfoBar(
- const Extension* new_extension,
+ const extensions::Extension* new_extension,
const SkBitmap& icon,
Profile* profile) {
Browser* browser = browser::FindLastActiveWithProfile(profile);
@@ -55,7 +55,7 @@
namespace browser {
void ShowExtensionInstalledBubble(
- const Extension* extension,
+ const extensions::Extension* extension,
Browser* browser,
const SkBitmap& icon,
Profile* profile) {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h
index b31d6c65..a4a76b9 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h
@@ -15,13 +15,13 @@
#include "third_party/skia/include/core/SkBitmap.h"
class Browser;
-class Extension;
class ExtensionLoadedNotificationObserver;
@class HoverCloseButton;
@class InfoBubbleView;
namespace extensions {
class BundleInstaller;
+class Extension;
}
namespace extension_installed_bubble {
@@ -52,7 +52,7 @@
// future.
@interface ExtensionInstalledBubbleController : BaseBubbleController {
@private
- const Extension* extension_; // weak
+ const extensions::Extension* extension_; // weak
const extensions::BundleInstaller* bundle_; // weak
Browser* browser_; // weak
scoped_nsobject<NSImage> icon_;
@@ -83,14 +83,14 @@
IBOutlet NSTextField* failedItemsMsg_;
}
-@property(nonatomic, readonly) const Extension* extension;
+@property(nonatomic, readonly) const extensions::Extension* extension;
@property(nonatomic, readonly) const extensions::BundleInstaller* bundle;
@property(nonatomic) BOOL pageActionRemoved;
// Initialize the window, and then create observers to wait for the extension
// to complete loading, or the browser window to close.
- (id)initWithParentWindow:(NSWindow*)parentWindow
- extension:(const Extension*)extension
+ extension:(const extensions::Extension*)extension
bundle:(const extensions::BundleInstaller*)bundle
browser:(Browser*)browser
icon:(SkBitmap)icon;
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
index 9d4317e..1869dbf 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -33,6 +33,7 @@
using content::BrowserThread;
using extensions::BundleInstaller;
+using extensions::Extension;
// C++ class that receives EXTENSION_LOADED notifications and proxies them back
// to |controller|.
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index aa36932..a26eaa0 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -21,6 +21,8 @@
#import "third_party/ocmock/OCMock/OCMock.h"
#include "webkit/glue/image_decoder.h"
+using extensions::Extension;
+
// ExtensionInstalledBubbleController with removePageActionPreview overridden
// to a no-op, because pageActions are not yet hooked up in the test browser.
@interface ExtensionInstalledBubbleControllerForTest :
diff --git a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
index b5020ec0..5dfd030 100644
--- a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h
@@ -31,7 +31,7 @@
class ShellWindowCocoa : public ShellWindow {
public:
ShellWindowCocoa(Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url);
// BaseWindow implementation.
diff --git a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
index 01e41fb9..03ec1fe 100644
--- a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
@@ -25,7 +25,7 @@
@end
ShellWindowCocoa::ShellWindowCocoa(Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url)
: ShellWindow(profile, extension, url),
attention_request_id_(0) {
@@ -170,7 +170,7 @@
// static
ShellWindow* ShellWindow::CreateImpl(Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url) {
return new ShellWindowCocoa(profile, extension, url);
}
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index cff2141..6bae9920 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -69,7 +69,8 @@
// Load the Extension's icon image.
void LoadIcon() {
- const Extension* extension = delegate_->extension_host()->extension();
+ const extensions::Extension* extension = delegate_->extension_host()->
+ extension();
ExtensionResource icon_resource =
extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_BITTY,
ExtensionIconSet::MATCH_EXACTLY);
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
index 29a1bcf..aa7976cf 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
@@ -22,6 +22,7 @@
#include "skia/ext/skia_utils_mac.h"
using content::WebContents;
+using extensions::Extension;
namespace {
