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

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

Issue 284333002: Revert 270872 "Move all callers of GetHomeDir() to PathService::..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
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 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 arraysize(kCommonSwitchNames)); 1506 arraysize(kCommonSwitchNames));
1507 1507
1508 #if defined(ENABLE_IPC_FUZZER) 1508 #if defined(ENABLE_IPC_FUZZER)
1509 static const char* const kIpcFuzzerSwitches[] = { 1509 static const char* const kIpcFuzzerSwitches[] = {
1510 switches::kIpcFuzzerTestcase, 1510 switches::kIpcFuzzerTestcase,
1511 }; 1511 };
1512 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, 1512 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches,
1513 arraysize(kIpcFuzzerSwitches)); 1513 arraysize(kIpcFuzzerSwitches));
1514 #endif 1514 #endif
1515 1515
1516 #if defined(OS_CHROMEOS)
1517 // On Chrome OS need to pass primary user homedir (in multi-profiles session).
1518 base::FilePath homedir;
1519 PathService::Get(base::DIR_HOME, &homedir);
1520 command_line->AppendSwitchASCII(chromeos::switches::kHomedir,
1521 homedir.value().c_str());
1522 #endif
1523
1524 if (process_type == switches::kRendererProcess) { 1516 if (process_type == switches::kRendererProcess) {
1525 #if defined(OS_CHROMEOS) 1517 #if defined(OS_CHROMEOS)
1526 const std::string& login_profile = 1518 const std::string& login_profile =
1527 browser_command_line.GetSwitchValueASCII( 1519 browser_command_line.GetSwitchValueASCII(
1528 chromeos::switches::kLoginProfile); 1520 chromeos::switches::kLoginProfile);
1529 if (!login_profile.empty()) 1521 if (!login_profile.empty())
1530 command_line->AppendSwitchASCII( 1522 command_line->AppendSwitchASCII(
1531 chromeos::switches::kLoginProfile, login_profile); 1523 chromeos::switches::kLoginProfile, login_profile);
1532 #endif 1524 #endif
1533 1525
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
2760 switches::kDisableWebRtcEncryption, 2752 switches::kDisableWebRtcEncryption,
2761 }; 2753 };
2762 to_command_line->CopySwitchesFrom(from_command_line, 2754 to_command_line->CopySwitchesFrom(from_command_line,
2763 kWebRtcDevSwitchNames, 2755 kWebRtcDevSwitchNames,
2764 arraysize(kWebRtcDevSwitchNames)); 2756 arraysize(kWebRtcDevSwitchNames));
2765 } 2757 }
2766 } 2758 }
2767 #endif // defined(ENABLE_WEBRTC) 2759 #endif // defined(ENABLE_WEBRTC)
2768 2760
2769 } // namespace chrome 2761 } // namespace chrome
OLDNEW
« no previous file with comments | « trunk/src/chrome/app/chrome_main_delegate.cc ('k') | trunk/src/chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698