diff options
| author | mlerman <mlerman@chromium.org> | 2014-09-09 06:10:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 13:16:01 +0000 |
| commit | 6b30e882803f34879eaf0b17f7d15bb8b3cfddb1 (patch) | |
| tree | ec7fe81c330b03ad2c57ed34c9b2c265ed7ad27b /chrome/browser/chrome_browser_main.cc | |
| parent | 31b72476ee7119ea0d950cff7c4c5f1654b4da05 (diff) | |
| download | chromium_src-6b30e882803f34879eaf0b17f7d15bb8b3cfddb1.zip chromium_src-6b30e882803f34879eaf0b17f7d15bb8b3cfddb1.tar.gz chromium_src-6b30e882803f34879eaf0b17f7d15bb8b3cfddb1.tar.bz2 | |
Never open guest pre-NewAvatarMenu
BUG=410228
Review URL: https://codereview.chromium.org/547663002
Cr-Commit-Position: refs/heads/master@{#293929}
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 14ab8a4..ea7aea6 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -344,6 +344,13 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters, #else base::FilePath profile_path = GetStartupProfilePath(user_data_dir, parsed_command_line); + + // Without NewAvatarMenu, replace guest with any existing profile. + if (!switches::IsNewAvatarMenu() && + profile_path == ProfileManager::GetGuestProfilePath()) { + profile_path = g_browser_process->profile_manager()->GetProfileInfoCache(). + GetPathOfProfileAtIndex(0); + } profile = g_browser_process->profile_manager()->GetProfile( profile_path); |