| OLD | NEW |
| 1 // Copyright (c) 2011 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 <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" | |
| 11 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| 12 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 13 #include "base/process_util.h" | 12 #include "base/process_util.h" |
| 14 #include "base/sha1.h" | 13 #include "base/sha1.h" |
| 15 #include "base/string16.h" | 14 #include "base/string16.h" |
| 16 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
| 17 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 18 #include "base/utf_string_conversions.h" | 17 #include "base/utf_string_conversions.h" |
| 19 #include "base/version.h" | 18 #include "base/version.h" |
| 20 #include "chrome/common/chrome_constants.h" | 19 #include "chrome/common/chrome_constants.h" |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 | 260 |
| 262 // The user data directory is the only other flag we currently want to | 261 // The user data directory is the only other flag we currently want to |
| 263 // possibly store. | 262 // possibly store. |
| 264 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 263 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); |
| 265 FilePath user_data_dir = | 264 FilePath user_data_dir = |
| 266 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); | 265 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); |
| 267 if (!user_data_dir.empty()) | 266 if (!user_data_dir.empty()) |
| 268 autorun_command_line_->AppendSwitchPath(switches::kUserDataDir, | 267 autorun_command_line_->AppendSwitchPath(switches::kUserDataDir, |
| 269 user_data_dir); | 268 user_data_dir); |
| 270 } | 269 } |
| OLD | NEW |