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

chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc

 // Copyright 2017 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/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h"
 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace safe_browsing {
 
 namespace {
@@ skipping 28 matching lines @@
 
   model->ReportUmaMetrics();
 
   if (!model->ShouldPromptForReset())
     return;
 
   Profile* profile = model->profile();
 
   // Ensure that there is at least one non-incognito browser open for the
   // profile before attempting to show the dialog.
-  if (!chrome::FindTabbedBrowser(profile, /*match_original_profiles=*/false))
+  Browser* browser =
+      chrome::FindTabbedBrowser(profile, /*match_original_profiles=*/false);
+  if (!browser)
     return;
 
-  chrome::ScopedTabbedBrowserDisplayer displayer(profile);
+  // First, show the browser window, and only then show the dialog so that the
+  // dialog will have focus.
+  if (browser->window()->IsMinimized())
+    browser->window()->Restore();
+  browser->window()->Show();
+
   // 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(
     std::unique_ptr<SettingsResetPromptConfig> config) {
   DCHECK(config);
 
   Browser* browser = chrome::FindLastActive();
   if (!browser)
     return;
 
@@ skipping 145 matching lines @@
   if (!config)
     return;
 
   base::TimeDelta delay = config->delay_before_prompt();
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(MaybeShowSettingsResetPrompt, base::Passed(&config)), delay);
 }
 
 }  // namespace safe_browsing