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

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: cleanup Created 6 years, 7 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 arraysize(kCommonSwitchNames)); 1504 arraysize(kCommonSwitchNames));
1505 1505
1506 #if defined(ENABLE_IPC_FUZZER) 1506 #if defined(ENABLE_IPC_FUZZER)
1507 static const char* const kIpcFuzzerSwitches[] = { 1507 static const char* const kIpcFuzzerSwitches[] = {
1508 switches::kIpcFuzzerTestcase, 1508 switches::kIpcFuzzerTestcase,
1509 }; 1509 };
1510 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, 1510 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches,
1511 arraysize(kIpcFuzzerSwitches)); 1511 arraysize(kIpcFuzzerSwitches));
1512 #endif 1512 #endif
1513 1513
1514 #if defined(OS_CHROMEOS)
1515 // On Chrome OS need to pass primary user homedir (in multi-profiles session).
1516 base::FilePath homedir;
1517 PathService::Get(base::DIR_HOME, &homedir);
1518 command_line->AppendSwitchASCII(chromeos::switches::kHomedir,
1519 homedir.value().c_str());
1520 #endif
1521
1514 if (process_type == switches::kRendererProcess) { 1522 if (process_type == switches::kRendererProcess) {
1515 #if defined(OS_CHROMEOS) 1523 #if defined(OS_CHROMEOS)
1516 const std::string& login_profile = 1524 const std::string& login_profile =
1517 browser_command_line.GetSwitchValueASCII( 1525 browser_command_line.GetSwitchValueASCII(
1518 chromeos::switches::kLoginProfile); 1526 chromeos::switches::kLoginProfile);
1519 if (!login_profile.empty()) 1527 if (!login_profile.empty())
1520 command_line->AppendSwitchASCII( 1528 command_line->AppendSwitchASCII(
1521 chromeos::switches::kLoginProfile, login_profile); 1529 chromeos::switches::kLoginProfile, login_profile);
1522 #endif 1530 #endif
1523 1531
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2749 switches::kDisableWebRtcEncryption, 2757 switches::kDisableWebRtcEncryption,
2750 }; 2758 };
2751 to_command_line->CopySwitchesFrom(from_command_line, 2759 to_command_line->CopySwitchesFrom(from_command_line,
2752 kWebRtcDevSwitchNames, 2760 kWebRtcDevSwitchNames,
2753 arraysize(kWebRtcDevSwitchNames)); 2761 arraysize(kWebRtcDevSwitchNames));
2754 } 2762 }
2755 } 2763 }
2756 #endif // defined(ENABLE_WEBRTC) 2764 #endif // defined(ENABLE_WEBRTC)
2757 2765
2758 } // namespace chrome 2766 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698