| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/scoped_nsautorelease_pool.h" | 10 #include "base/mac/scoped_nsautorelease_pool.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/process_util.h" | 12 #include "base/process_util.h" |
| 13 #include "base/sha1.h" | 13 #include "base/sha1.h" |
| 14 #include "base/singleton.h" | 14 #include "base/singleton.h" |
| 15 #include "base/string16.h" | 15 #include "base/string16.h" |
| 16 #include "base/string_number_conversions.h" | 16 #include "base/string_number_conversions.h" |
| 17 #include "base/string_util.h" | 17 #include "base/string_util.h" |
| 18 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 19 #include "base/version.h" | 19 #include "base/version.h" |
| 20 #include "chrome/common/child_process_host.h" | |
| 21 #include "chrome/common/chrome_constants.h" | 20 #include "chrome/common/chrome_constants.h" |
| 22 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
| 23 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
| 24 #include "chrome/common/chrome_version_info.h" | 23 #include "chrome/common/chrome_version_info.h" |
| 25 #include "chrome/common/service_process_util.h" | 24 #include "chrome/common/service_process_util.h" |
| 25 #include "content/common/child_process_host.h" |
| 26 | 26 |
| 27 #if !defined(OS_MACOSX) | 27 #if !defined(OS_MACOSX) |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 // This should be more than enough to hold a version string assuming each part | 31 // This should be more than enough to hold a version string assuming each part |
| 32 // of the version string is an int64. | 32 // of the version string is an int64. |
| 33 const uint32 kMaxVersionStringLength = 256; | 33 const uint32 kMaxVersionStringLength = 256; |
| 34 | 34 |
| 35 // The structure that gets written to shared memory. | 35 // The structure that gets written to shared memory. |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 | 274 |
| 275 // The user data directory is the only other flag we currently want to | 275 // The user data directory is the only other flag we currently want to |
| 276 // possibly store. | 276 // possibly store. |
| 277 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 277 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
| 278 FilePath user_data_dir = | 278 FilePath user_data_dir = |
| 279 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); | 279 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); |
| 280 if (!user_data_dir.empty()) | 280 if (!user_data_dir.empty()) |
| 281 autorun_command_line_->AppendSwitchPath(switches::kUserDataDir, | 281 autorun_command_line_->AppendSwitchPath(switches::kUserDataDir, |
| 282 user_data_dir); | 282 user_data_dir); |
| 283 } | 283 } |
| OLD | NEW |