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

Side by Side Diff: ash/test/test_suite_init.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/test/test_suite_init.h" 5 #include "ash/test/test_suite_init.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace test { 15 namespace test {
16 16
17 void OverrideFrameworkBundle() { 17 void OverrideFrameworkBundle() {
18 // Look in the AuraShell.app directory for resources. 18 // Look in the AuraShell.app directory for resources.
19 base::FilePath path; 19 base::FilePath path;
20 PathService::Get(base::DIR_EXE, &path); 20 PathService::Get(base::DIR_EXE, &path);
21 path = path.Append(FILE_PATH_LITERAL("AuraShell.app")); 21 path = path.Append(FILE_PATH_LITERAL("AuraShell.app"));
22 base::mac::SetOverrideFrameworkBundlePath(path); 22 base::mac::SetOverrideFrameworkBundlePath(path);
23 } 23 }
24 24
25 } // namespace test 25 } // namespace test
26 } // namespace ash 26 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698