Allow chrome to become the os default handler for arbitrary protocols on mac/win.

chrome/browser/shell_integration.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 43 matching lines @@
   } else {
     // Use '--app=url' instead of just 'url' to launch the browser with minimal
     // chrome.
     // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
     new_cmd_line.AppendSwitchASCII(switches::kApp, url.spec());
   }
   return new_cmd_line;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// ShellIntegration::DefaultWebClientWorker
+//
+
+ShellIntegration::DefaultWebClientWorker::DefaultWebClientWorker(
+    DefaultWebClientObserver* observer)
+    : observer_(observer) {
+}
+
+void ShellIntegration::DefaultWebClientWorker::StartCheckIsDefault() {
+  if (observer_) {
+    observer_->SetDefaultWebClientUIState(STATE_PROCESSING);
+  }
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      NewRunnableMethod(
+          this, &DefaultWebClientWorker::ExecuteCheckIsDefault));
+}
+
+void ShellIntegration::DefaultWebClientWorker::StartSetAsDefault() {
+  if (observer_) {
+    observer_->SetDefaultWebClientUIState(STATE_PROCESSING);
+  }
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      NewRunnableMethod(
+          this, &DefaultWebClientWorker::ExecuteSetAsDefault));
+}
+
+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.
+  observer_ = NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// DefaultWebClientWorker, private:
+
+

[xiyuan, 2011/05/24 17:55:20]

nit: nuke one empty line.

[benwells, 2011/05/25 08:07:19]

Done.

+void ShellIntegration::DefaultWebClientWorker::ExecuteCheckIsDefault() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DefaultWebClientState state = CheckIsDefault();
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      NewRunnableMethod(
+          this, &DefaultWebClientWorker::CompleteCheckIsDefault,
+          state));

[Mark Mentovai, 2011/05/24 16:28:53]

This would fit on the previous line.

[benwells, 2011/05/25 08:07:19]

Done.

+}
+
+void ShellIntegration::DefaultWebClientWorker::CompleteCheckIsDefault(
+    DefaultWebClientState state) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  UpdateUI(state);
+}
+
+void ShellIntegration::DefaultWebClientWorker::ExecuteSetAsDefault() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  SetAsDefault();
+  ShellIntegration::SetAsDefaultBrowser();
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      NewRunnableMethod(
+          this, &DefaultWebClientWorker::CompleteSetAsDefault));
+}
+
+void ShellIntegration::DefaultWebClientWorker::CompleteSetAsDefault() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (observer_) {

[Mark Mentovai, 2011/05/24 16:28:53]

It doesn’t seem like you need this |observer_| check. Seems dangerous in case
something like CompleteCheckIsDefault ever winds up doing something more
involved than just calling through to the observer.

[benwells, 2011/05/25 08:07:19]

Interesting and valid point. Instead of checking here, I've put this check in
StartCheckIsDefault. Currently the meaning of the checking process is to check
and report back to the observer; if no observer is present this process is
meaningless and can be skipped, there are no side effects. 

If this ever changes - that is, if what CheckIsDefault is meant to do changes -
StartCheckIsDefault will need to be updated, which is not unexpected and
shouldn't catch anyone out.

+    // 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);
+        break;
+      case IS_DEFAULT_WEB_CLIENT:
+        observer_->SetDefaultWebClientUIState(STATE_IS_DEFAULT);
+        break;
+      case UNKNOWN_DEFAULT_WEB_CLIENT:
+        observer_->SetDefaultWebClientUIState(STATE_UNKNOWN);
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // ShellIntegration::DefaultBrowserWorker
 //
 
 ShellIntegration::DefaultBrowserWorker::DefaultBrowserWorker(
-    DefaultBrowserObserver* observer)
-    : observer_(observer) {
-}
-
-void ShellIntegration::DefaultBrowserWorker::StartCheckDefaultBrowser() {
-  observer_->SetDefaultBrowserUIState(STATE_PROCESSING);
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableMethod(
-          this, &DefaultBrowserWorker::ExecuteCheckDefaultBrowser));
-}
-
-void ShellIntegration::DefaultBrowserWorker::StartSetAsDefaultBrowser() {
-  observer_->SetDefaultBrowserUIState(STATE_PROCESSING);
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableMethod(
-          this, &DefaultBrowserWorker::ExecuteSetAsDefaultBrowser));
-}
-
-void ShellIntegration::DefaultBrowserWorker::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.
-  observer_ = NULL;
+    DefaultWebClientObserver* observer)
+    : DefaultWebClientWorker(observer) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultBrowserWorker, private:
 
-void ShellIntegration::DefaultBrowserWorker::ExecuteCheckDefaultBrowser() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  DefaultBrowserState state = ShellIntegration::IsDefaultBrowser();
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &DefaultBrowserWorker::CompleteCheckDefaultBrowser, state));
+ShellIntegration::DefaultWebClientState
+ShellIntegration::DefaultBrowserWorker::CheckIsDefault() {
+  return ShellIntegration::IsDefaultBrowser();
 }
 
-void ShellIntegration::DefaultBrowserWorker::CompleteCheckDefaultBrowser(
-    DefaultBrowserState state) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  UpdateUI(state);
+void ShellIntegration::DefaultBrowserWorker::SetAsDefault() {
+  ShellIntegration::SetAsDefaultBrowser();
 }
 
-void ShellIntegration::DefaultBrowserWorker::ExecuteSetAsDefaultBrowser() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  ShellIntegration::SetAsDefaultBrowser();
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &DefaultBrowserWorker::CompleteSetAsDefaultBrowser));
+///////////////////////////////////////////////////////////////////////////////
+// ShellIntegration::DefaultProtocolClientWorker
+//
+
+ShellIntegration::DefaultProtocolClientWorker::DefaultProtocolClientWorker(
+    DefaultWebClientObserver* observer, const std::string& protocol)
+    : DefaultWebClientWorker(observer),
+      protocol_(protocol) {
 }
 
-void ShellIntegration::DefaultBrowserWorker::CompleteSetAsDefaultBrowser() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (observer_) {
-    // Set as default completed, check again to make sure it stuck...
-    StartCheckDefaultBrowser();
-  }
+///////////////////////////////////////////////////////////////////////////////
+// DefaultProtocolClientWorker, private:
+
+ShellIntegration::DefaultWebClientState
+ShellIntegration::DefaultProtocolClientWorker::CheckIsDefault() {
+  return ShellIntegration::IsDefaultProtocolClient(protocol_);
 }
 
-void ShellIntegration::DefaultBrowserWorker::UpdateUI(
-    DefaultBrowserState state) {
-  if (observer_) {
-    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;
-    }
-  }
+void ShellIntegration::DefaultProtocolClientWorker::SetAsDefault() {
+  ShellIntegration::SetAsDefaultProtocolClient(protocol_);
 }