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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/cocoa/menu_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
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/base/cocoa/hover_image_button_unittest.mm ('k') | ui/base/cocoa/menu_controller.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/menu_controller.h
diff --git a/ui/base/cocoa/menu_controller.h b/ui/base/cocoa/menu_controller.h
index 19ccea25cb80146a761a9115eb36cc225a935658..a85640468a6163912e16bf57c16b359dade1ae1f 100644
--- a/ui/base/cocoa/menu_controller.h
+++ b/ui/base/cocoa/menu_controller.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/string16.h"
#include "ui/base/ui_export.h"
@@ -25,7 +25,7 @@ UI_EXPORT
@interface MenuController : NSObject<NSMenuDelegate> {
@protected
ui::MenuModel* model_; // weak
- scoped_nsobject<NSMenu> menu_;
+ base::scoped_nsobject<NSMenu> menu_;
BOOL useWithPopUpButtonCell_; // If YES, 0th item is blank
BOOL isMenuOpen_;
}
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/base/cocoa/hover_image_button_unittest.mm ('k') | ui/base/cocoa/menu_controller.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698