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

chrome/browser/views/options/general_page_view.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 
+#include "chrome/browser/shell_integration.h"
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/shelf_item_dialog.h"
 #include "chrome/common/pref_member.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/button/button.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 
 namespace views {
 class Checkbox;
@@ skipping 10 matching lines @@
 class TableModel;
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView
 
 class GeneralPageView : public OptionsPageView,
                         public views::Combobox::Listener,
                         public views::ButtonListener,
                         public views::Textfield::Controller,
                         public ShelfItemDialogDelegate,
-                        public views::TableViewObserver {
+                        public views::TableViewObserver,
+                        public ShellIntegration::DefaultBrowserObserver {
  public:
   explicit GeneralPageView(Profile* profile);
   virtual ~GeneralPageView();
 
  protected:
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender);
 
   // views::Combobox::Listener implementation:
   virtual void ItemChanged(views::Combobox* combobox,
                            int prev_index,
                            int new_index);
 
   // views::Textfield::Controller implementation:
   virtual void ContentsChanged(views::Textfield* sender,
                                const std::wstring& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke& key);
 
   // OptionsPageView implementation:
   virtual void InitControlLayout();
   virtual void NotifyPrefChanged(const std::wstring* pref_name);
   virtual void HighlightGroup(OptionsGroup highlight_group);
 
   // views::View overrides:
   virtual void Layout();
 
  private:
-  // The current default browser UI state
-  enum DefaultBrowserUIState {
-    STATE_PROCESSING,
-    STATE_DEFAULT,
-    STATE_NOT_DEFAULT
-  };
+  // ShellIntegration::DefaultBrowserObserver implementation:
   // Updates the UI state to reflect the current default browser state.
-  void SetDefaultBrowserUIState(DefaultBrowserUIState state);
+  virtual void SetDefaultBrowserUIState(ShellIntegration::DefaultBrowserUIState state);
 
   // Init all the dialog controls
   void InitStartupGroup();
   void InitHomepageGroup();
   void InitDefaultSearchGroup();
   void InitDefaultBrowserGroup();
 
   // Saves the startup preference from that of the ui.
   void SaveStartupPref();
 
@@ skipping 59 matching lines @@
   views::Combobox* default_search_engine_combobox_;
   views::NativeButton* default_search_manage_engines_button_;
   scoped_ptr<SearchEngineListModel> default_search_engines_model_;
 
   // Controls for the Default Browser group
   OptionsGroupView* default_browser_group_;
   views::Label* default_browser_status_label_;
   views::NativeButton* default_browser_use_as_default_button_;
 
   // The helper object that performs default browser set/check tasks.
-  class DefaultBrowserWorker;
-  friend DefaultBrowserWorker;
-  scoped_refptr<DefaultBrowserWorker> default_browser_worker_;
+  scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
 
   DISALLOW_COPY_AND_ASSIGN(GeneralPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_