[Merge] Fix "Switch to {Profile}..." focusing the wrong window.

chrome/browser/ui/webui/signin/signin_error_handler.cc

 // Copyright 2016 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/webui/signin/signin_error_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/signin_ui_util.h"
@@ skipping 20 matching lines @@
   web_ui()->RegisterMessageCallback(
       "initializedWithSize",
       base::Bind(&SigninErrorHandler::HandleInitializedWithSize,
                  base::Unretained(this)));
 }
 
 void SigninErrorHandler::HandleSwitchToExistingProfile(
     const base::ListValue* args) {
   if (duplicate_profile_path_.empty())
     return;
+
+  // CloseDialog will eventually destroy this object, so nothing should access
+  // its members after this call. However, closing the dialog may steal focus
+  // back to the original window, so make a copy of the path to switch to and
+  // perform the switch after the dialog is closed.
+  base::FilePath path_switching_to = duplicate_profile_path_;
+  CloseDialog();
+
   // Switch to the existing duplicate profile. Do not create a new window when
   // any existing ones can be reused.
-  profiles::SwitchToProfile(duplicate_profile_path_, false,
+  profiles::SwitchToProfile(path_switching_to, false,
                             ProfileManager::CreateCallback(),
                             ProfileMetrics::SWITCH_PROFILE_DUPLICATE);
-  // CloseDialog will eventually destroy this object, so nothing should access
-  // its members after this call.
-  CloseDialog();
 }
 
 void SigninErrorHandler::HandleConfirm(const base::ListValue* args) {
   CloseDialog();
 }
 
 void SigninErrorHandler::HandleLearnMore(const base::ListValue* args) {
   Browser* browser = signin::GetDesktopBrowser(web_ui());
   DCHECK(browser);
   browser->CloseModalSigninWindow();
@@ skipping 19 matching lines @@
   if (is_system_profile_) {
     // Avoid closing the user manager window when the error message is displayed
     // without browser window.
     UserManager::HideReauthDialog();
   } else {
     Browser* browser = signin::GetDesktopBrowser(web_ui());
     DCHECK(browser);
     browser->CloseModalSigninWindow();
   }
 }