Never open guest pre-NewAvatarMenu

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 324 matching lines @@
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   // On ChromeOS and Android the ProfileManager will use the same path as the
   // one we got passed. GetActiveUserProfile will therefore use the correct path
   // automatically.
   DCHECK_EQ(user_data_dir.value(),
             g_browser_process->profile_manager()->user_data_dir().value());
   profile = ProfileManager::GetActiveUserProfile();
 #else
   base::FilePath profile_path =
       GetStartupProfilePath(user_data_dir, parsed_command_line);
+
+  // Without NewAvatarMenu, replace guest with the default profile.
+  if (!switches::IsNewAvatarMenu() &&
+      profile_path == ProfileManager::GetGuestProfilePath()) {
+    profile_path = g_browser_process->profile_manager()->GetProfileInfoCache().
+        GetPathOfProfileAtIndex(0);

[jochen (gone - plz use gerrit), 2014/09/08 12:14:21]

is zero the default profile? Should maybe be a constant on ProfileInfoCache
then? Or should this rather be the last used profile?

[Mike Lerman, 2014/09/08 14:02:33]

The problem with the last used profile is the last used profile was guest...
which I can't use because the flag that introduced guest is now disabled. So I'm
essentially opening any profile I can find.

There's no concept of a "Default" profile, or anything particularly special
about the profile at index 0, except that I'm guaranteed to have a profile at
index 0.

+  }
   profile = g_browser_process->profile_manager()->GetProfile(
       profile_path);
 
   // If we're using the --new-profile-management flag and this profile is
   // signed out, then we should show the user manager instead. By switching
   // the active profile to the guest profile we ensure that no
   // browser windows will be opened for the guest profile.
   if (switches::IsNewProfileManagement() && !profile->IsGuestSession()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
@@ skipping 1325 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }