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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 200473002: Move all callers of GetHomeDir() to PathService::Get(base::DIR_HOME). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move subprocess homedir override to ChromeContentBrowserClient/ChromeMainDelegate Created 6 years, 8 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 arraysize(kCommonSwitchNames)); 1480 arraysize(kCommonSwitchNames));
1481 1481
1482 #if defined(ENABLE_IPC_FUZZER) 1482 #if defined(ENABLE_IPC_FUZZER)
1483 static const char* const kIpcFuzzerSwitches[] = { 1483 static const char* const kIpcFuzzerSwitches[] = {
1484 switches::kIpcFuzzerTestcase, 1484 switches::kIpcFuzzerTestcase,
1485 }; 1485 };
1486 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, 1486 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches,
1487 arraysize(kIpcFuzzerSwitches)); 1487 arraysize(kIpcFuzzerSwitches));
1488 #endif 1488 #endif
1489 1489
1490 #if defined(OS_CHROMEOS)
1491 // On Chrome OS need to pass primary user homedir (in multi-profiles session).
1492 base::FilePath homedir;
1493 PathService::Get(base::DIR_HOME, &homedir);
1494 command_line->AppendSwitchASCII(chromeos::switches::kHomedir,
1495 homedir.value().c_str());
1496 #endif
1497
1490 if (process_type == switches::kRendererProcess) { 1498 if (process_type == switches::kRendererProcess) {
1491 #if defined(OS_CHROMEOS) 1499 #if defined(OS_CHROMEOS)
1492 const std::string& login_profile = 1500 const std::string& login_profile =
1493 browser_command_line.GetSwitchValueASCII( 1501 browser_command_line.GetSwitchValueASCII(
1494 chromeos::switches::kLoginProfile); 1502 chromeos::switches::kLoginProfile);
1495 if (!login_profile.empty()) 1503 if (!login_profile.empty())
1496 command_line->AppendSwitchASCII( 1504 command_line->AppendSwitchASCII(
1497 chromeos::switches::kLoginProfile, login_profile); 1505 chromeos::switches::kLoginProfile, login_profile);
1498 #endif 1506 #endif
1499 1507
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2716 switches::kDisableWebRtcEncryption, 2724 switches::kDisableWebRtcEncryption,
2717 }; 2725 };
2718 to_command_line->CopySwitchesFrom(from_command_line, 2726 to_command_line->CopySwitchesFrom(from_command_line,
2719 kWebRtcDevSwitchNames, 2727 kWebRtcDevSwitchNames,
2720 arraysize(kWebRtcDevSwitchNames)); 2728 arraysize(kWebRtcDevSwitchNames));
2721 } 2729 }
2722 } 2730 }
2723 #endif // defined(ENABLE_WEBRTC) 2731 #endif // defined(ENABLE_WEBRTC)
2724 2732
2725 } // namespace chrome 2733 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698