Improves first run dialog performance on Win8

chrome/browser/ui/webui/set_as_default_browser_ui_win.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/webui/set_as_default_browser_ui.h"
+#include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 44 matching lines @@
 // REGRETTED: user pressed Next but then elected a different default browser.
 enum MakeChromeDefaultResult {
   MAKE_CHROME_DEFAULT_ACCEPTED = 0,
   MAKE_CHROME_DEFAULT_DECLINED = 1,
   MAKE_CHROME_DEFAULT_REGRETTED = 2,
   // MAKE_CHROME_DEFAULT_ACCEPTED_IMMERSE = 3,  // Deprecated.
   MAKE_CHROME_DEFAULT_MAX
 };
 
 content::WebUIDataSource* CreateSetAsDefaultBrowserUIHTMLSource() {
-  content::WebUIDataSource* data_source = content::WebUIDataSource::Create(
-      chrome::kChromeUIMetroFlowHost);
+  content::WebUIDataSource* data_source =
+      content::WebUIDataSource::Create(chrome::kChromeUIMetroFlowHost);
   data_source->AddLocalizedString("page-title", IDS_METRO_FLOW_TAB_TITLE);
   data_source->AddLocalizedString("flowTitle", IDS_METRO_FLOW_TITLE_SHORT);
   data_source->AddLocalizedString("flowDescription",
                                   IDS_METRO_FLOW_DESCRIPTION);
-  data_source->AddLocalizedString("flowNext",
-                                  IDS_METRO_FLOW_SET_DEFAULT);
+  data_source->AddLocalizedString("flowNext", IDS_METRO_FLOW_SET_DEFAULT);
   data_source->AddLocalizedString("chromeLogoString",
                                   IDS_METRO_FLOW_LOGO_STRING_ALT);
   data_source->SetJsonPath("strings.js");
   data_source->AddResourcePath("set_as_default_browser.js",
                                IDR_SET_AS_DEFAULT_BROWSER_JS);
   data_source->SetDefaultResource(IDR_SET_AS_DEFAULT_BROWSER_HTML);
   return data_source;
 }
 
 // A simple class serving as a delegate for passing down the result of the
 // interaction.
 class ResponseDelegate {
  public:
   virtual void SetDialogInteractionResult(MakeChromeDefaultResult result) = 0;
 
  protected:
-  virtual ~ResponseDelegate() { }
+  virtual ~ResponseDelegate() {}
 };
 
 // Event handler for SetAsDefaultBrowserUI. Capable of setting Chrome as the
 // default browser on button click, closing itself and triggering Chrome
 // restart.
 class SetAsDefaultBrowserHandler : public WebUIMessageHandler {
  public:
   explicit SetAsDefaultBrowserHandler(
       const base::WeakPtr<ResponseDelegate>& response_delegate);
 
@@ skipping 74 matching lines @@
   // Otherwise, keep the dialog open since the user probably didn't make a
   // choice.
 }
 
 // A web dialog delegate implementation for when 'Make Chrome Metro' UI
 // is displayed on a dialog.
 class SetAsDefaultBrowserDialogImpl : public ui::WebDialogDelegate,
                                       public ResponseDelegate,
                                       public chrome::BrowserListObserver {
  public:
-  SetAsDefaultBrowserDialogImpl(Profile* profile, Browser* browser);
+  explicit SetAsDefaultBrowserDialogImpl(Profile* profile);
   ~SetAsDefaultBrowserDialogImpl() override;
   // Show a modal web dialog with kChromeUIMetroFlowURL page.
   void ShowDialog();
+  static views::Widget* dialog_widget() { return dialog_widget_; }
 
  protected:
   // Overridden from WebDialogDelegate:
   ui::ModalType GetDialogModalType() const override;
   base::string16 GetDialogTitle() const override;
   GURL GetDialogContentURL() const override;
   void GetWebUIMessageHandlers(
       std::vector<WebUIMessageHandler*>* handlers) const override;
   void GetDialogSize(gfx::Size* size) const override;
   std::string GetDialogArgs() const override;
   void OnDialogClosed(const std::string& json_retval) override;
   void OnCloseContents(WebContents* source, bool* out_close_dialog) override;
   bool ShouldShowDialogTitle() const override;
   bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   // Overridden from ResponseDelegate:
   void SetDialogInteractionResult(MakeChromeDefaultResult result) override;
 
   // Overridden from BrowserListObserver:
+  void OnBrowserAdded(Browser* browser) override;
   void OnBrowserRemoved(Browser* browser) override;
 
  private:
   Profile* profile_;
   Browser* browser_;
   mutable bool owns_handler_;
   base::WeakPtrFactory<ResponseDelegate> response_delegate_ptr_factory_;
   SetAsDefaultBrowserHandler* handler_;
   MakeChromeDefaultResult dialog_interaction_result_;
 
+  static views::Widget* dialog_widget_;
+
   DISALLOW_COPY_AND_ASSIGN(SetAsDefaultBrowserDialogImpl);
 };
 
-SetAsDefaultBrowserDialogImpl::SetAsDefaultBrowserDialogImpl(Profile* profile,
-                                                             Browser* browser)
+views::Widget* SetAsDefaultBrowserDialogImpl::dialog_widget_ = nullptr;

[sky, 2016/07/25 20:10:03]

nit: prefix with // static (see style guide)

[zmin, 2016/07/25 20:23:11]

Done.

+
+SetAsDefaultBrowserDialogImpl::SetAsDefaultBrowserDialogImpl(Profile* profile)
     : profile_(profile),
-      browser_(browser),
+      browser_(nullptr),
       owns_handler_(true),
       response_delegate_ptr_factory_(this),
       handler_(new SetAsDefaultBrowserHandler(
           response_delegate_ptr_factory_.GetWeakPtr())),
       dialog_interaction_result_(MAKE_CHROME_DEFAULT_DECLINED) {
   BrowserList::AddObserver(this);
 }
 
 SetAsDefaultBrowserDialogImpl::~SetAsDefaultBrowserDialogImpl() {
   if (browser_)
     BrowserList::RemoveObserver(this);
   if (owns_handler_)
     delete handler_;
 }
 
 void SetAsDefaultBrowserDialogImpl::ShowDialog() {
   // Use a NULL parent window to make sure that the dialog will have an item
   // in the Windows task bar. The code below will make it highlight if the
   // dialog is not in the foreground.
   gfx::NativeWindow native_window = chrome::ShowWebDialog(NULL, profile_, this);
-  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
-      native_window);
-  widget->FlashFrame(true);
+  DCHECK(!dialog_widget_);
+  dialog_widget_ = views::Widget::GetWidgetForNativeWindow(native_window);
+  dialog_widget_->FlashFrame(true);
 }
 
 ui::ModalType SetAsDefaultBrowserDialogImpl::GetDialogModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 base::string16 SetAsDefaultBrowserDialogImpl::GetDialogTitle() const {
   return l10n_util::GetStringUTF16(IDS_METRO_FLOW_TAB_TITLE);
 }
 
 GURL SetAsDefaultBrowserDialogImpl::GetDialogContentURL() const {
   std::string url_string(chrome::kChromeUIMetroFlowURL);
   return GURL(url_string);
 }
 
 void SetAsDefaultBrowserDialogImpl::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
   handlers->push_back(handler_);
   owns_handler_ = false;
 }
 
 void SetAsDefaultBrowserDialogImpl::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = profile_->GetPrefs();
   gfx::Font approximate_web_font(
       prefs->GetString(prefs::kWebKitSansSerifFontFamily),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
-  *size = ui::GetLocalizedContentsSizeForFont(
-      IDS_METRO_FLOW_WIDTH_CHARS, IDS_METRO_FLOW_HEIGHT_LINES,
-      approximate_web_font);
+  *size = ui::GetLocalizedContentsSizeForFont(IDS_METRO_FLOW_WIDTH_CHARS,
+                                              IDS_METRO_FLOW_HEIGHT_LINES,
+                                              approximate_web_font);
 }
 
 std::string SetAsDefaultBrowserDialogImpl::GetDialogArgs() const {
   return "[]";
 }
 
 void SetAsDefaultBrowserDialogImpl::OnDialogClosed(
     const std::string& json_retval) {
   // Register the user's response in UMA.
   UMA_HISTOGRAM_ENUMERATION(kSetAsDefaultBrowserHistogram,
                             dialog_interaction_result_,
                             MAKE_CHROME_DEFAULT_MAX);
 
   // Suppress showing the default browser infobar if the user explicitly elected
   // *not to* make Chrome default.
   if (dialog_interaction_result_ == MAKE_CHROME_DEFAULT_REGRETTED)
     chrome::DefaultBrowserPromptDeclined(profile_);
 
   // Carry on with a normal chrome session. For the purpose of surfacing this
   // dialog the actual browser window had to remain hidden. Now it's time to
   // show it.
   if (browser_) {
     BrowserWindow* window = browser_->window();
     WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
     window->Show();
     if (contents)
       contents->SetInitialFocus();
   }
 
+  DCHECK(dialog_widget_);
+  dialog_widget_ = nullptr;
+
   delete this;
 }
 
 void SetAsDefaultBrowserDialogImpl::OnCloseContents(WebContents* source,
                                                     bool* out_close_dialog) {
   *out_close_dialog = true;
 }
 
 bool SetAsDefaultBrowserDialogImpl::ShouldShowDialogTitle() const {
   return true;
 }
 
 bool SetAsDefaultBrowserDialogImpl::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }
 
 void SetAsDefaultBrowserDialogImpl::SetDialogInteractionResult(
     MakeChromeDefaultResult result) {
   dialog_interaction_result_ = result;
 }
 
+void SetAsDefaultBrowserDialogImpl::OnBrowserAdded(Browser* browser) {
+  if (browser_ || !browser || !browser->is_type_tabbed())

[sky, 2016/07/25 20:10:03]

Should this early out if dialog_widget_?

[zmin, 2016/07/25 20:23:11]

dialog_widget_ is only used for testing so I think DCHECK is good enough. 

And I think it's good to put the DCHECK in ShowDialog() in case someone else
want to call that function in other place in the future because dialog_widget_
is assigned in that function.

[sky, 2016/07/25 20:24:12]

What prevents another browser from being created while the dialog is showing?

+    return;
+  browser_ = browser;
+  ShowDialog();
+}
+
 void SetAsDefaultBrowserDialogImpl::OnBrowserRemoved(Browser* browser) {
   if (browser_ == browser) {
     browser_ = NULL;
     BrowserList::RemoveObserver(this);
   }
 }
 
 }  // namespace
 
 SetAsDefaultBrowserUI::SetAsDefaultBrowserUI(content::WebUI* web_ui)
     : ui::WebDialogUI(web_ui) {
-  content::WebUIDataSource::Add(
-      Profile::FromWebUI(web_ui), CreateSetAsDefaultBrowserUIHTMLSource());
+  content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
+                                CreateSetAsDefaultBrowserUIHTMLSource());
 }
 
 // static
-void SetAsDefaultBrowserUI::Show(Profile* profile, Browser* browser) {
+void SetAsDefaultBrowserUI::Show(Profile* profile) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  SetAsDefaultBrowserDialogImpl* dialog =
-      new SetAsDefaultBrowserDialogImpl(profile, browser);
-  dialog->ShowDialog();
+  new SetAsDefaultBrowserDialogImpl(profile);
 }
+
+// static
+views::Widget* SetAsDefaultBrowserUI::GetDialogWidgetForTesting() {
+  return SetAsDefaultBrowserDialogImpl::dialog_widget();
+}