Fix running default browser check/setting in UI thread on Linux....

chrome/browser/gtk/options/general_page_gtk.cc

 // Copyright (c) 2006-2009 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/gtk/options/general_page_gtk.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/gtk/keyword_editor_view.h"
 #include "chrome/browser/gtk/list_store_favicon_loader.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/session_startup_pref.h"
-#include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
@@ skipping 23 matching lines @@
 
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageGtk, public:
 
 GeneralPageGtk::GeneralPageGtk(Profile* profile)
     : OptionsPageBase(profile),
       template_url_model_(NULL),
       default_search_initializing_(true),
-      initializing_(true)  {
+      initializing_(true),
+      default_browser_worker_(
+          new ShellIntegration::DefaultBrowserWorker(this)) {
   OptionsLayoutBuilderGtk options_builder;
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_GROUP_NAME),
       InitStartupGroup(), true);
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_HOMEPAGE_GROUP_NAME),
       InitHomepageGroup(), false);
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),
       InitDefaultSearchGroup(), false);
@@ skipping 14 matching lines @@
   NotifyPrefChanged(NULL);
 }
 
 GeneralPageGtk::~GeneralPageGtk() {
   profile()->GetPrefs()->RemovePrefObserver(prefs::kRestoreOnStartup, this);
   profile()->GetPrefs()->RemovePrefObserver(
       prefs::kURLsToRestoreOnStartup, this);
 
   if (template_url_model_)
     template_url_model_->RemoveObserver(this);
+
+  default_browser_worker_->ObserverDestroyed();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageGtk, OptionsPageBase overrides:
 
 void GeneralPageGtk::NotifyPrefChanged(const std::wstring* pref_name) {
   initializing_ = true;
   if (!pref_name || *pref_name == prefs::kRestoreOnStartup) {
     PrefService* prefs = profile()->GetPrefs();
     const SessionStartupPref startup_pref =
@@ skipping 226 matching lines @@
                    G_CALLBACK(OnDefaultSearchManageEnginesClicked), this);
   gtk_box_pack_end(GTK_BOX(hbox), default_search_manage_engines_button_,
                    FALSE, FALSE, 0);
 
   return hbox;
 }
 
 GtkWidget* GeneralPageGtk::InitDefaultBrowserGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
+  // TODO(mattm): the label should be created with a text like "checking for
+  // default" to be displayed while we wait for the check to complete.
   default_browser_status_label_ = gtk_label_new(NULL);
   gtk_box_pack_start(GTK_BOX(vbox), default_browser_status_label_,
                      FALSE, FALSE, 0);
 
   default_browser_use_as_default_button_ = gtk_button_new_with_label(
       l10n_util::GetStringFUTF8(IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str());
   g_signal_connect(G_OBJECT(default_browser_use_as_default_button_), "clicked",
                    G_CALLBACK(OnBrowserUseAsDefaultClicked), this);
   gtk_box_pack_start(GTK_BOX(vbox), default_browser_use_as_default_button_,
                      FALSE, FALSE, 0);
 
   GtkWidget* vbox_alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
   gtk_container_add(GTK_CONTAINER(vbox_alignment), vbox);
 
-  SetDefaultBrowserUIState(ShellIntegration::IsDefaultBrowser());
+  default_browser_worker_->StartCheckDefaultBrowser();
 
   return vbox_alignment;
 }
 
 // static
 void GeneralPageGtk::OnStartupRadioToggled(GtkToggleButton* toggle_button,
                                            GeneralPageGtk* general_page) {
   if (general_page->initializing_)
     return;
   if (!gtk_toggle_button_get_active(toggle_button)) {
@@ skipping 103 matching lines @@
 // static
 void GeneralPageGtk::OnDefaultSearchManageEnginesClicked(
     GtkButton* button, GeneralPageGtk* general_page) {
   KeywordEditorView::Show(general_page->profile());
 }
 
 // static
 void GeneralPageGtk::OnBrowserUseAsDefaultClicked(
     GtkButton* button,
     GeneralPageGtk* general_page) {
-  general_page->SetDefaultBrowserUIState(
-      ShellIntegration::SetAsDefaultBrowser());
+  general_page->default_browser_worker_->StartSetAsDefaultBrowser();
   // If the user made Chrome the default browser, then he/she arguably wants
   // to be notified when that changes.
   general_page->profile()->GetPrefs()->SetBoolean(prefs::kCheckDefaultBrowser,
                                                   true);
   general_page->UserMetricsRecordAction(L"Options_SetAsDefaultBrowser",
                                         general_page->profile()->GetPrefs());
 }
 
 void GeneralPageGtk::SaveStartupPref() {
   SessionStartupPref pref;
@@ skipping 180 matching lines @@
 
 void GeneralPageGtk::EnableCustomHomepagesControls(bool enable) {
   gtk_widget_set_sensitive(startup_add_custom_page_button_, enable);
   gtk_widget_set_sensitive(startup_remove_custom_page_button_,
       enable &&
       gtk_tree_selection_count_selected_rows(startup_custom_pages_selection_));
   gtk_widget_set_sensitive(startup_use_current_page_button_, enable);
   gtk_widget_set_sensitive(startup_custom_pages_tree_, enable);
 }
 
-void GeneralPageGtk::SetDefaultBrowserUIState(bool is_default) {
-  const char* color;
+void GeneralPageGtk::SetDefaultBrowserUIState(
+    ShellIntegration::DefaultBrowserUIState state) {
+  const char* color = NULL;
   std::string text;
-  if (is_default) {
+  if (state == ShellIntegration::STATE_DEFAULT) {
     color = kDefaultBrowserLabelColor;
     text = l10n_util::GetStringFUTF8(IDS_OPTIONS_DEFAULTBROWSER_DEFAULT,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-  } else {
+  } else if (state == ShellIntegration::STATE_NOT_DEFAULT) {
     color = kNotDefaultBrowserLabelColor;
     text = l10n_util::GetStringFUTF8(IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
-  char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
-                                         color, text.c_str());
-  gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
-  g_free(markup);
+  if (color) {
+    char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
+                                           color, text.c_str());
+    gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
+    g_free(markup);
+  }
 
-  gtk_widget_set_sensitive(default_browser_use_as_default_button_, !is_default);
+  gtk_widget_set_sensitive(default_browser_use_as_default_button_,
+                           state == ShellIntegration::STATE_NOT_DEFAULT);
 }