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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/app_list/cocoa/app_list_window_controller_unittest.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
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/app_list/cocoa/app_list_window_controller.mm ('k') | ui/app_list/cocoa/apps_collection_view_drag_manager.h » ('j') | ui/base/cocoa/menu_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/app_list_window_controller_unittest.mm
diff --git a/ui/app_list/cocoa/app_list_window_controller_unittest.mm b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
index 12cccdb67f55c801f4357079de76ff26f631e6a0..8ea354464ee72a455ce6b075d3cfb47adac1826c 100644
--- a/ui/app_list/cocoa/app_list_window_controller_unittest.mm
+++ b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#import "testing/gtest_mac.h"
#include "ui/app_list/app_list_view_delegate.h"
#import "ui/app_list/cocoa/app_list_view_controller.h"
@@ -19,7 +19,7 @@ class AppListWindowControllerTest : public ui::CocoaTest {
protected:
virtual void TearDown() OVERRIDE;
- scoped_nsobject<AppListWindowController> controller_;
+ base::scoped_nsobject<AppListWindowController> controller_;
app_list::test::AppListTestViewDelegate* delegate() {
return static_cast<app_list::test::AppListTestViewDelegate*>(
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/app_list/cocoa/app_list_window_controller.mm ('k') | ui/app_list/cocoa/apps_collection_view_drag_manager.h » ('j') | ui/base/cocoa/menu_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698