Settings reset prompt: the dialog should have focus when shown.

chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc

Index: chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
index 1cce55ebc0959f5c33286b67a3272bd9f443f175..ed1f918ca8c6c1201bb6d0c95f3e84de5ee7e00b 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
@@ -71,11 +71,17 @@ void OnModelCreated(std::unique_ptr<SettingsResetPromptModel> model) {
   if (!chrome::FindTabbedBrowser(profile, /*match_original_profiles=*/false))
     return;
 
-  chrome::ScopedTabbedBrowserDisplayer displayer(profile);
+  // First, find a browser window and show it, and only then show the dialog so
+  // that the dialog will have focus.
+  Browser* browser = nullptr;
+  {
+    chrome::ScopedTabbedBrowserDisplayer displayer(profile);

[sky, 2017/03/21 20:36:01]

If a new browser is created by ScopedTabbedBrowserDisplayer then I don't see you
adding anything to it, which would result in an empty tabbed-browser and all
sorts of problems. You should only use ScopedTabbedBrowserDisplayer  if you're
going to add a tab to it.

[alito2, 2017/03/21 20:44:17]

Just above this line, I do make sure that there is at least one non-incognito
tabbed browser already open. I think that should be enough to ensure that we
don't end up in a weird situation?

Another option is to explicitly use that tabbed browser found above and slightly
duplicate the code in the ScopedTabbedBrowserDisplayer's destructor.

[sky, 2017/03/21 20:52:18]

Indeed. In that case you should use the return value from FindTabbedBrowser and
you should have no need for ScopedTabbedBrowserDisplayer.

[alito, 2017/03/21 21:02:42]

Done.

+    browser = displayer.browser();
+  }
   // The |SettingsResetPromptController| object will delete itself after the
   // reset prompt dialog has been closed.
   SettingsResetPromptController::ShowSettingsResetPrompt(
-      displayer.browser(), new SettingsResetPromptController(std::move(model)));
+      browser, new SettingsResetPromptController(std::move(model)));
 }
 
 void MaybeShowSettingsResetPrompt(