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

Side by Side Diff: base/prefs/pref_paths.cc

Issue 11411159: base/prefs: Break the dependency in chrome_paths.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ui/gfx/gfx_paths.h" 5 #include "base/prefs/pref_paths.h"
6 6
7 #include "base/command_line.h"
8 #include "base/file_path.h"
9 #include "base/file_util.h" 7 #include "base/file_util.h"
10 #include "base/path_service.h" 8 #include "base/path_service.h"
11 9
12 namespace gfx { 10 namespace base {
11 namespace prefs {
13 12
14 bool PathProvider(int key, FilePath* result) { 13 bool PathProvider(int key, FilePath* result) {
15 FilePath cur;
16 switch (key) { 14 switch (key) {
17 // The following are only valid in the development environment, and 15 case DIR_TEST_DATA: {
18 // will fail if executed from an installed executable (because the 16 FilePath cur;
19 // generated path won't exist).
20 case DIR_TEST_DATA:
21 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) 17 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
22 return false; 18 return false;
23 cur = cur.Append(FILE_PATH_LITERAL("ui")); 19 cur = cur.Append(FILE_PATH_LITERAL("base"));
24 cur = cur.Append(FILE_PATH_LITERAL("gfx")); 20 cur = cur.Append(FILE_PATH_LITERAL("prefs"));
25 cur = cur.Append(FILE_PATH_LITERAL("test")); 21 cur = cur.Append(FILE_PATH_LITERAL("test"));
26 cur = cur.Append(FILE_PATH_LITERAL("data")); 22 cur = cur.Append(FILE_PATH_LITERAL("data"));
27 if (!file_util::PathExists(cur)) // we don't want to create this 23 if (!file_util::PathExists(cur)) // We don't want to create this.
28 return false; 24 return false;
25
26 *result = cur;
27 return true;
29 break; 28 break;
29 }
30 default: 30 default:
31 return false; 31 return false;
32 } 32 }
33 33
34 *result = cur; 34 return false;
35 return true;
36 } 35 }
37 36
38 // This cannot be done as a static initializer sadly since Visual Studio will 37 // This cannot be done as a static initializer sadly since Visual Studio will
39 // eliminate this object file if there is no direct entry point into it. 38 // eliminate this object file if there is no direct entry point into it.
40 void RegisterPathProvider() { 39 void RegisterPathProvider() {
41 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); 40 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
42 } 41 }
43 42
44 } // namespace gfx 43 } // namespace prefs
44 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698