Allow the default browser check to return "unknown" and reflect that in the UI.

chrome/browser/shell_integration.cc

 // 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.
 
 #include "chrome/browser/shell_integration.h"
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 26 matching lines @@
   // Our associated view has gone away, so we shouldn't call back to it if
   // our worker thread returns after the view is dead.
   observer_ = NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultBrowserWorker, private:
 
 void ShellIntegration::DefaultBrowserWorker::ExecuteCheckDefaultBrowser() {
   DCHECK(MessageLoop::current() == file_loop_);
-  bool is_default = ShellIntegration::IsDefaultBrowser();
+  DefaultBrowserState state = ShellIntegration::IsDefaultBrowser();
   ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
-      &DefaultBrowserWorker::CompleteCheckDefaultBrowser, is_default));
+      &DefaultBrowserWorker::CompleteCheckDefaultBrowser, state));
 }
 
 void ShellIntegration::DefaultBrowserWorker::CompleteCheckDefaultBrowser(
-    bool is_default) {
+    DefaultBrowserState state) {
   DCHECK(MessageLoop::current() == ui_loop_);
-  UpdateUI(is_default);
+  UpdateUI(state);
 }
 
 void ShellIntegration::DefaultBrowserWorker::ExecuteSetAsDefaultBrowser() {
   DCHECK(MessageLoop::current() == file_loop_);
   ShellIntegration::SetAsDefaultBrowser();
   ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
       &DefaultBrowserWorker::CompleteSetAsDefaultBrowser));
 }
 
 void ShellIntegration::DefaultBrowserWorker::CompleteSetAsDefaultBrowser() {
   DCHECK(MessageLoop::current() == ui_loop_);
   if (observer_) {
     // Set as default completed, check again to make sure it stuck...
     StartCheckDefaultBrowser();
   }
 }
 
-void ShellIntegration::DefaultBrowserWorker::UpdateUI(bool is_default) {
+void ShellIntegration::DefaultBrowserWorker::UpdateUI(
+    DefaultBrowserState state) {
   if (observer_) {
-    DefaultBrowserUIState state =
-        is_default ? STATE_DEFAULT : STATE_NOT_DEFAULT;
-    observer_->SetDefaultBrowserUIState(state);
+    switch (state) {
+      case NOT_DEFAULT_BROWSER:
+        observer_->SetDefaultBrowserUIState(STATE_NOT_DEFAULT);
+        break;
+      case IS_DEFAULT_BROWSER:
+        observer_->SetDefaultBrowserUIState(STATE_IS_DEFAULT);
+        break;
+      case UNKNOWN_DEFAULT_BROWSER:
+        observer_->SetDefaultBrowserUIState(STATE_UNKNOWN);
+        break;
+      default:
+        break;
+    }
   }
 }