Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/ui/startup/startup_browser_creator.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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 232 matching lines @@
 // The file is overwritten if it exists. This function should only be called in
 // the blocking pool.
 void DumpBrowserHistograms(const base::FilePath& output_file) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   std::string output_string(base::StatisticsRecorder::ToJSON(std::string()));
   base::WriteFile(output_file, output_string.data(),
                   static_cast<int>(output_string.size()));
 }
 
+// Shows the User Manager on startup if the last used profile must sign in or
+// if the last used profile was the guest or system profile.
+// Returns true if the User Manager was shown, false otherwise.
+bool ShowUserManagerOnStartupIfNeeded(
+    Profile* last_used_profile, const base::CommandLine& command_line) {
+#if defined(OS_CHROMEOS)
+  // ChromeOS never shows the User Manager on startup.
+  return false;
+#endif

[Peter Kasting, 2015/09/25 23:42:52]

This can trigger an unreachable code warning.  Instead put the remainder of this
function in an "#else" section.

[anthonyvd, 2015/09/29 20:23:15]

Done.

+
+  ProfileInfoCache& profile_info =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  size_t profile_index = profile_info.GetIndexOfProfileWithPath(
+      last_used_profile->GetPath());
+  bool signin_required = profile_index != std::string::npos &&
+      profile_info.ProfileIsSigninRequiredAtIndex(profile_index);
+
+  // Guest, system or locked profiles cannot be re-opened on startup. The
+  // only exception is if there's already a Guest window open in a separate
+  // process (for example, launching a new browser after clicking on a
+  // downloaded file in Guest mode).
+  bool guest_or_system = last_used_profile->IsGuestSession() ||
+                         last_used_profile->IsSystemProfile();
+  bool has_guest_browsers = guest_or_system &&
+      chrome::GetTotalBrowserCountForProfile(
+          last_used_profile->GetOffTheRecordProfile()) > 0;
+  if (signin_required || (guest_or_system && !has_guest_browsers)) {
+    profiles::UserManagerProfileSelected action =
+        command_line.HasSwitch(switches::kShowAppList) ?
+            profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER :
+            profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION;
+    UserManager::Show(
+        base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL, action);
+    return true;
+  }
+
+  return false;
+}

[Peter Kasting, 2015/09/25 23:42:52]

Nit: Compared to the implementation above, this is both slightly shorter and
slightly more efficient.  (Also fixes a non-const ref to be a const ref.)

  const ProfileInfoCache& profile_info =
      g_browser_process->profile_manager()->GetProfileInfoCache();
  size_t profile_index =
      profile_info.GetIndexOfProfileWithPath(last_used_profile->GetPath());
  if ((profile_index == std::string::npos) ||
      !profile_info.ProfileIsSigninRequiredAtIndex(profile_index)) {
    // Signin is not required.  However, guest, system or locked profiles cannot
    // be re-opened on startup. The only exception is if there's already a Guest
    // window open in a separate process (for example, launching a new browser
    // after clicking on a downloaded file in Guest mode).
    if ((!last_used_profile->IsGuestSession() &&
         !last_used_profile->IsSystemProfile()) ||
        (chrome::GetTotalBrowserCountForProfile(
             last_used_profile->GetOffTheRecordProfile()) > 0))
      return false;
  }

  // Show the User Manager.
  profiles::UserManagerProfileSelected action =
      command_line.HasSwitch(switches::kShowAppList) ?
          profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER :
          profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION;
  UserManager::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL,
                    action);
  return true;
}

[anthonyvd, 2015/09/29 20:23:15]

I feel like your version is a little easier to follow for the reader as well so
done. Thanks!

+
 }  // namespace
 
 StartupBrowserCreator::StartupBrowserCreator()
     : is_default_browser_dialog_suppressed_(false),
       show_main_browser_window_(true) {
 }
 
 StartupBrowserCreator::~StartupBrowserCreator() {}
 
 // static
@@ skipping 401 matching lines @@
       chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
   // |last_opened_profiles| will be empty in the following circumstances:
   // - This is the first launch. |last_used_profile| is the initial profile.
   // - The user exited the browser by closing all windows for all
   // profiles. |last_used_profile| is the profile which owned the last open
   // window.
   // - Only incognito windows were open when the browser exited.
   // |last_used_profile| is the last used incognito profile. Restoring it will
   // create a browser window for the corresponding original profile.
   if (last_opened_profiles.empty()) {
-    // If the last used profile is locked or was a guest, show the user manager.
-    if (switches::IsNewAvatarMenu()) {
-      ProfileInfoCache& profile_info =
-          g_browser_process->profile_manager()->GetProfileInfoCache();
-      size_t profile_index = profile_info.GetIndexOfProfileWithPath(
-          last_used_profile->GetPath());
-      bool signin_required = profile_index != std::string::npos &&
-          profile_info.ProfileIsSigninRequiredAtIndex(profile_index);
-
-      // Guest, system or locked profiles cannot be re-opened on startup. The
-      // only exception is if there's already a Guest window open in a separate
-      // process (for example, launching a new browser after clicking on a
-      // downloaded file in Guest mode).
-      bool guest_or_system = last_used_profile->IsGuestSession() ||
-                             last_used_profile->IsSystemProfile();
-      bool has_guest_browsers = guest_or_system &&
-          chrome::GetTotalBrowserCountForProfile(
-              last_used_profile->GetOffTheRecordProfile()) > 0;
-      if (signin_required || (guest_or_system && !has_guest_browsers)) {
-        profiles::UserManagerProfileSelected action =
-            command_line.HasSwitch(switches::kShowAppList) ?
-                profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER :
-                profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION;
-        UserManager::Show(
-            base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL, action);
-        return true;
-      }
+    if (ShowUserManagerOnStartupIfNeeded(last_used_profile, command_line)) {

[Peter Kasting, 2015/09/25 23:42:52]

Nit: Or just:

  if (last_opened_profiles.empty() &&
      ShowUserManagerOnStartupIfNeeded(last_used_profile, command_line))
    return true;

[anthonyvd, 2015/09/29 20:23:15]

I'm not sure that's equivalent, the rest of the block (line 717-724) is included
under if (last_opened_profiles.empty()). (Unless I'm missing something)

[Peter Kasting, 2015/09/29 20:34:16]

You're right, my suggestion is wrong.  Sorry!

I suggest removing the braces here, though, as seeing that close brace is part
of what led my eye to misread the outer conditional as being closed.

[anthonyvd, 2015/09/30 18:34:03]

Done.

+      return true;
     }
 
     Profile* profile_to_open = last_used_profile->IsGuestSession() ?
         last_used_profile->GetOffTheRecordProfile() : last_used_profile;
 
     if (!browser_creator->LaunchBrowser(command_line, profile_to_open,
                                         cur_dir, is_process_startup,
                                         is_first_run)) {
       return false;
     }
   } else {
+#if !defined(OS_CHROMEOS)
     // Guest profiles should not be reopened on startup. This can happen if
     // the last used profile was a Guest, but other profiles were also open
     // when Chrome was closed. In this case, pick a different open profile
     // to be the active one, since the Guest profile is never added to the list
     // of open profiles.
-    if (switches::IsNewAvatarMenu() && last_used_profile->IsGuestSession()) {
+    if (last_used_profile->IsGuestSession()) {
       DCHECK(!last_opened_profiles[0]->IsGuestSession());
       last_used_profile = last_opened_profiles[0];
     }
+#endif
 
     // Launch the last used profile with the full command line, and the other
     // opened profiles without the URLs to launch.
     base::CommandLine command_line_without_urls(command_line.GetProgram());
     const base::CommandLine::SwitchMap& switches = command_line.GetSwitches();
     for (base::CommandLine::SwitchMap::const_iterator switch_it =
              switches.begin();
          switch_it != switches.end(); ++switch_it) {
       command_line_without_urls.AppendSwitchNative(switch_it->first,
                                                    switch_it->second);
@@ skipping 111 matching lines @@
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
     return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
         GetProfilePath(user_data_dir);
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(
       user_data_dir);
 }