| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_frame/chrome_launcher_utils.h" | 5 #include "chrome_frame/chrome_launcher_utils.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.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/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/string_util.h" |
| 12 #include "base/win/windows_version.h" | 13 #include "base/win/windows_version.h" |
| 13 #include "chrome/common/chrome_constants.h" | 14 #include "chrome/common/chrome_constants.h" |
| 14 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 15 #include "chrome_frame/chrome_frame_automation.h" | 16 #include "chrome_frame/chrome_frame_automation.h" |
| 16 | 17 |
| 17 namespace { | 18 namespace { |
| 18 | 19 |
| 19 const char kUpdateCommandFlag[] = "--update-cmd"; | 20 const char kUpdateCommandFlag[] = "--update-cmd"; |
| 20 | 21 |
| 21 CommandLine* CreateChromeLauncherCommandLine() { | 22 CommandLine* CreateChromeLauncherCommandLine() { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 // instead. | 82 // instead. |
| 82 if (!file_util::PathExists(cur_path)) { | 83 if (!file_util::PathExists(cur_path)) { |
| 83 PathService::Get(base::DIR_MODULE, &cur_path); | 84 PathService::Get(base::DIR_MODULE, &cur_path); |
| 84 cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName); | 85 cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName); |
| 85 } | 86 } |
| 86 | 87 |
| 87 return cur_path; | 88 return cur_path; |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace chrome_launcher | 91 } // namespace chrome_launcher |
| OLD | NEW |