OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/common/chrome_paths.h" | 5 #include "chrome/common/chrome_paths.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/mac_util.h" | |
12 #include "base/path_service.h" | 11 #include "base/path_service.h" |
13 #include "base/string_util.h" | 12 #include "base/string_util.h" |
14 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
15 #include "chrome/common/chrome_constants.h" | 14 #include "chrome/common/chrome_constants.h" |
16 #include "chrome/common/chrome_paths_internal.h" | 15 #include "chrome/common/chrome_paths_internal.h" |
17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
18 | 17 |
| 18 #if defined(OS_MACOSX) |
| 19 #include "base/mac_util.h" |
| 20 #endif |
| 21 |
19 namespace chrome { | 22 namespace chrome { |
20 | 23 |
21 bool GetGearsPluginPathFromCommandLine(FilePath* path) { | 24 bool GetGearsPluginPathFromCommandLine(FilePath* path) { |
22 #ifndef NDEBUG | 25 #ifndef NDEBUG |
23 // for debugging, support a cmd line based override | 26 // for debugging, support a cmd line based override |
24 std::wstring plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValue( | 27 std::wstring plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValue( |
25 switches::kGearsPluginPathOverride); | 28 switches::kGearsPluginPathOverride); |
26 // TODO(tc): After GetSwitchNativeValue lands, we don't need to use | 29 // TODO(tc): After GetSwitchNativeValue lands, we don't need to use |
27 // FromWStringHack. | 30 // FromWStringHack. |
28 *path = FilePath::FromWStringHack(plugin_path); | 31 *path = FilePath::FromWStringHack(plugin_path); |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 return true; | 204 return true; |
202 } | 205 } |
203 | 206 |
204 // This cannot be done as a static initializer sadly since Visual Studio will | 207 // This cannot be done as a static initializer sadly since Visual Studio will |
205 // eliminate this object file if there is no direct entry point into it. | 208 // eliminate this object file if there is no direct entry point into it. |
206 void RegisterPathProvider() { | 209 void RegisterPathProvider() { |
207 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 210 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
208 } | 211 } |
209 | 212 |
210 } // namespace chrome | 213 } // namespace chrome |
OLD | NEW |