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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.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
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm ('k') | chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
index f92d83307f3f35cf237abecc4af3d03b41d58953..e32534e9d1b8f4a3d3d92a633d1738ed90fb7545 100644
--- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include <vector>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/browser_command_executor.h"
#include "chrome/browser/ui/extensions/native_app_window.h"
@@ -159,7 +159,7 @@ class NativeAppWindowCocoa : public NativeAppWindow {
gfx::Size max_size_;
bool resizable_;
- scoped_nsobject<NativeAppWindowController> window_controller_;
+ base::scoped_nsobject<NativeAppWindowController> window_controller_;
NSInteger attention_request_id_; // identifier from requestUserAttention
// Indicates whether system drag or custom drag should be used, depending on
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm ('k') | chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698