Prototype version of the first-run dialog for Windows 8

chrome/browser/shell_integration.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/shell_integration.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 102 matching lines @@
   if (observer_) {
     observer_->SetDefaultWebClientUIState(STATE_PROCESSING);
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(
             &DefaultWebClientWorker::ExecuteCheckIsDefault, this));
   }
 }
 
 void ShellIntegration::DefaultWebClientWorker::StartSetAsDefault() {
+  bool interactive_permitted = false;
   if (observer_) {
     observer_->SetDefaultWebClientUIState(STATE_PROCESSING);
+    interactive_permitted = observer_->IsInteractiveSetDefaultPermitted();
   }
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(
-          &DefaultWebClientWorker::ExecuteSetAsDefault, this));
+      base::Bind(&DefaultWebClientWorker::ExecuteSetAsDefault, this,
+                 interactive_permitted));
 }
 
 void ShellIntegration::DefaultWebClientWorker::ObserverDestroyed() {
   // Our associated view has gone away, so we shouldn't call back to it if
   // our worker thread returns after the view is dead.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observer_ = NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UpdateUI(state);
   // The worker has finished everything it needs to do, so free the observer
   // if we own it.
   if (observer_ && observer_->IsOwnedByWorker()) {
     delete observer_;
     observer_ = NULL;
   }
 }
 
-void ShellIntegration::DefaultWebClientWorker::ExecuteSetAsDefault() {
+void ShellIntegration::DefaultWebClientWorker::ExecuteSetAsDefault(
+    bool interactive_permitted) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  SetAsDefault(observer_ && observer_->IsInteractiveSetDefaultPermitted());
+
+  bool result = SetAsDefault(interactive_permitted);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &DefaultWebClientWorker::CompleteSetAsDefault, this));
+      base::Bind(&DefaultWebClientWorker::CompleteSetAsDefault, this, result));
 }
 
-void ShellIntegration::DefaultWebClientWorker::CompleteSetAsDefault() {
+void ShellIntegration::DefaultWebClientWorker::CompleteSetAsDefault(
+    bool call_result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  // First tell the observer what the SetAsDefault call has returned.
+  if (observer_)
+    observer_->OnSetAsDefaultConcluded(call_result);
   // Set as default completed, check again to make sure it stuck...
   StartCheckIsDefault();
 }
 
 void ShellIntegration::DefaultWebClientWorker::UpdateUI(
     DefaultWebClientState state) {
   if (observer_) {
     switch (state) {
       case NOT_DEFAULT_WEB_CLIENT:
         observer_->SetDefaultWebClientUIState(STATE_NOT_DEFAULT);
@@ skipping 20 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultBrowserWorker, private:
 
 ShellIntegration::DefaultWebClientState
 ShellIntegration::DefaultBrowserWorker::CheckIsDefault() {
   return ShellIntegration::IsDefaultBrowser();
 }
 
-void ShellIntegration::DefaultBrowserWorker::SetAsDefault(
+bool ShellIntegration::DefaultBrowserWorker::SetAsDefault(
     bool interactive_permitted) {
+  bool result = false;
   switch (ShellIntegration::CanSetAsDefaultBrowser()) {
     case ShellIntegration::SET_DEFAULT_UNATTENDED:
-      ShellIntegration::SetAsDefaultBrowser();
+      result = ShellIntegration::SetAsDefaultBrowser();
       break;
     case ShellIntegration::SET_DEFAULT_INTERACTIVE:
       if (interactive_permitted)
-        ShellIntegration::SetAsDefaultBrowserInteractive();
+        result = ShellIntegration::SetAsDefaultBrowserInteractive();
       break;
     default:
       NOTREACHED();
   }
+
+  return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ShellIntegration::DefaultProtocolClientWorker
 //
 
 ShellIntegration::DefaultProtocolClientWorker::DefaultProtocolClientWorker(
     DefaultWebClientObserver* observer, const std::string& protocol)
     : DefaultWebClientWorker(observer),
       protocol_(protocol) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultProtocolClientWorker, private:
 
 ShellIntegration::DefaultWebClientState
 ShellIntegration::DefaultProtocolClientWorker::CheckIsDefault() {
   return ShellIntegration::IsDefaultProtocolClient(protocol_);
 }
 
-void ShellIntegration::DefaultProtocolClientWorker::SetAsDefault(
+bool ShellIntegration::DefaultProtocolClientWorker::SetAsDefault(
     bool interactive_permitted) {
-  ShellIntegration::SetAsDefaultProtocolClient(protocol_);
+  return ShellIntegration::SetAsDefaultProtocolClient(protocol_);
 }