Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5859)

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_action_button.h

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/browser_action_button.h
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.h b/chrome/browser/ui/cocoa/extensions/browser_action_button.h
index e8bad88cb476a2c840f4a3243fe71aa576c79377..1b4ecebdf5d7d374346b1c54b88e4f203726b797 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 @@ extern NSString* const kBrowserActionButtonDragEndNotification;
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 @@ extern NSString* const kBrowserActionButtonDragEndNotification;
}
- (id)initWithFrame:(NSRect)frame
- extension:(const Extension*)extension
+ extension:(const extensions::Extension*)extension
profile:(Profile*)profile
tabId:(int)tabId;
@@ -76,7 +79,7 @@ extern NSString* const kBrowserActionButtonDragEndNotification;
- (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
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698