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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

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
« no previous file with comments | « chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm ('k') | chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_service_mac.mm
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 032b7065087752df1abdfc2edafe980212ec03f5..291d1d483ba263b17c371c21b8b8131dcdcfa62d 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -7,7 +7,7 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/lazy_instance.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/singleton.h"
#include "base/message_loop.h"
#include "base/observer_list.h"
@@ -75,7 +75,7 @@ class AppListServiceMac : public AppListServiceImpl,
AppListServiceMac() {}
- scoped_nsobject<AppListWindowController> window_controller_;
+ base::scoped_nsobject<AppListWindowController> window_controller_;
// App shim hosts observing when the app list is dismissed. In normal user
// usage there should only be one. However, it can't be guaranteed, so use
« no previous file with comments | « chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm ('k') | chrome/browser/ui/cocoa/about_ipc_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698