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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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_actions_controller.h
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h
index f24a8d1d052afd8710fafeae4bfbf426fde61cfa..37cd3f037f5877b6aea9a614e97cc35d00624e47 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
class Browser;
@@ -52,19 +52,19 @@ extern NSString* const kBrowserActionVisibilityChangedNotification;
// A dictionary of Extension ID -> BrowserActionButton pairs representing the
// buttons present in the container view. The ID is a string unique to each
// extension.
- scoped_nsobject<NSMutableDictionary> buttons_;
+ base::scoped_nsobject<NSMutableDictionary> buttons_;
// Array of hidden buttons in the correct order in which the user specified.
- scoped_nsobject<NSMutableArray> hiddenButtons_;
+ base::scoped_nsobject<NSMutableArray> hiddenButtons_;
// The currently running chevron animation (fade in/out).
- scoped_nsobject<NSViewAnimation> chevronAnimation_;
+ base::scoped_nsobject<NSViewAnimation> chevronAnimation_;
// The chevron button used when Browser Actions are hidden.
- scoped_nsobject<MenuButton> chevronMenuButton_;
+ base::scoped_nsobject<MenuButton> chevronMenuButton_;
// The Browser Actions overflow menu.
- scoped_nsobject<NSMenu> overflowMenu_;
+ base::scoped_nsobject<NSMenu> overflowMenu_;
}
@property(readonly, nonatomic) BrowserActionsContainerView* containerView;

Powered by Google App Engine
This is Rietveld 408576698