Nicely handle OnBeforeUnloads with guest and lock mode.

chrome/browser/profiles/profile_window.cc

 // Copyright 2013 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/profiles/profile_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 241 matching lines @@
           placeholder_avatar_index)),
       base::Bind(&OpenBrowserWindowForProfile,
                  callback,
                  true,
                  true,
                  desktop_type),
       std::string());
   ProfileMetrics::LogProfileAddNewUser(metric);
 }
 
+void GuestBrowserCloseSuccess(const size_t profile_index) {
+  chrome::ShowUserManager(base::FilePath());
+}
+
 void CloseGuestProfileWindows() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   Profile* profile = profile_manager->GetProfileByPath(
       ProfileManager::GetGuestProfilePath());
 
   if (profile) {
-    BrowserList::CloseAllBrowsersWithProfile(profile);
+    BrowserList::CloseAllBrowsersWithProfile(profile,
+        base::Bind(&GuestBrowserCloseSuccess));

[Peter Kasting, 2014/08/28 18:46:12]

Nit: All lines of args should be aligned (multiple places)

[Mike Lerman, 2014/08/29 18:02:20]

Done.

   }
 }
 
+void LockBrowserCloseSuccess(const size_t profile_index) {

[noms (inactive), 2014/08/28 19:22:29]

I think it would be better if this took the profile path, and not an index. It
would make GuestBrowserCloseSuccess look less weird (actually use its parameter)
and reduce any sketchiness about the indexes in the ProfileInfoCache (which
change whenever the ProfileInfoCache gets resorted)

[Mike Lerman, 2014/08/29 18:02:21]

Done.

+  ProfileInfoCache& cache =

[Peter Kasting, 2014/08/28 18:46:12]

Nit: Use pointers or const refs rather than non-const refs

[Mike Lerman, 2014/08/29 18:02:20]

Done.

+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  DCHECK_LT(profile_index, cache.GetNumberOfProfiles());
+
+  cache.SetProfileSigninRequiredAtIndex(profile_index, true);
+  chrome::ShowUserManager(cache.GetPathOfProfileAtIndex(profile_index));
+}
+
 void LockProfile(Profile* profile) {
   DCHECK(profile);
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-
-  size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
-  cache.SetProfileSigninRequiredAtIndex(index, true);
-  chrome::ShowUserManager(profile->GetPath());
-  BrowserList::CloseAllBrowsersWithProfile(profile);
+  if (profile) {
+    BrowserList::CloseAllBrowsersWithProfile(profile,
+        base::Bind(&LockBrowserCloseSuccess));
+  }
 }
 
 void CreateGuestProfileForUserManager(
     const base::FilePath& profile_path_to_focus,
     profiles::UserManagerTutorialMode tutorial_mode,
     const base::Callback<void(Profile*, const std::string&)>& callback) {
   // Create the guest profile, if necessary, and open the User Manager
   // from the guest profile.
   g_browser_process->profile_manager()->CreateProfileAsync(
       ProfileManager::GetGuestProfilePath(),
@@ skipping 84 matching lines @@
     case BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR:
       *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
       *tutorial_mode = TUTORIAL_MODE_SHOW_ERROR;
       return;
     default:
       *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
   }
 }
 
 }  // namespace profiles