ui/app_list/cocoa/app_list_view_controller_unittest.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/app_list/cocoa/app_list_view_controller_unittest.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:

Index: ui/app_list/cocoa/app_list_view_controller_unittest.mm

diff --git a/ui/app_list/cocoa/app_list_view_controller_unittest.mm b/ui/app_list/cocoa/app_list_view_controller_unittest.mm

index 566819e3697c2e74fd20d79effe71f7a3c4c3d18..e14f8845ac07afe5389934f50fe965300834a94d 100644

--- a/ui/app_list/cocoa/app_list_view_controller_unittest.mm

+++ b/ui/app_list/cocoa/app_list_view_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.

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#import "testing/gtest_mac.h"

#import "ui/app_list/cocoa/app_list_view_controller.h"

#import "ui/app_list/cocoa/apps_grid_controller.h"

@@ -37,7 +37,7 @@ class AppListViewControllerTest : public AppsGridControllerTestHelper {

}

protected:

- scoped_nsobject<AppListViewController> app_list_view_controller_;

+ base::scoped_nsobject<AppListViewController> app_list_view_controller_;

private:

DISALLOW_COPY_AND_ASSIGN(AppListViewControllerTest);