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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/root_window_host_mac.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups 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
« skia/ext/skia_utils_mac_unittest.mm ('K') | « ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm ('k') | ui/base/accelerators/platform_accelerator_cocoa.h » ('j') | webkit/common/cursors/webcursor_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_host_mac.mm
diff --git a/ui/aura/root_window_host_mac.mm b/ui/aura/root_window_host_mac.mm
index 35b1fc07a663abbe5c11467a68868117ac5a0e31..28943a958f9a9f0ec070d30ff386b49fb8a98e51 100644
--- a/ui/aura/root_window_host_mac.mm
+++ b/ui/aura/root_window_host_mac.mm
@@ -8,7 +8,7 @@
#include "base/compiler_specific.h"
#include "base/mac/bundle_locations.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/aura/event.h"
#include "ui/aura/root_window.h"
#include "ui/aura/root_window_host.h"
@@ -67,7 +67,7 @@ class RootWindowHostMac : public RootWindowHost,
// An NSWindowController for the root window. Controls the actual Cocoa
// window on Mac.
- scoped_nsobject<NSWindowController> controller_;
+ base::scoped_nsobject<NSWindowController> controller_;
DISALLOW_COPY_AND_ASSIGN(RootWindowHostMac);
};
« skia/ext/skia_utils_mac_unittest.mm ('K') | « ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm ('k') | ui/base/accelerators/platform_accelerator_cocoa.h » ('j') | webkit/common/cursors/webcursor_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698