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

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index e838e37bbdd37e2a1ddc953bf7c68dd7647f206a..94e3e04021c987e227c3325503670bd017bbab62 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -38,7 +38,7 @@
 BrowserOptionsHandler::BrowserOptionsHandler()
     : template_url_model_(NULL), startup_custom_pages_table_model_(NULL) {
 #if !defined(OS_MACOSX)
-  default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
+  default_browser_worker_ = new ShellIntegration::DefaultClientAppWorker(this);
 #endif
 }
 
@@ -167,12 +167,12 @@ void BrowserOptionsHandler::UpdateDefaultBrowserState() {
   }
 
 #if defined(OS_MACOSX)
-  ShellIntegration::DefaultBrowserState state =
+  ShellIntegration::DefaultClientAppState state =
       ShellIntegration::IsDefaultBrowser();
   int status_string_id;
-  if (state == ShellIntegration::IS_DEFAULT_BROWSER)
+  if (state == ShellIntegration::IS_DEFAULT_CLIENT_APP)
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
-  else if (state == ShellIntegration::NOT_DEFAULT_BROWSER)
+  else if (state == ShellIntegration::NOT_DEFAULT_CLIENT_APP)
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
   else
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
@@ -205,16 +205,16 @@ void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {
 }
 
 int BrowserOptionsHandler::StatusStringIdForState(
-    ShellIntegration::DefaultBrowserState state) {
-  if (state == ShellIntegration::IS_DEFAULT_BROWSER)
+    ShellIntegration::DefaultClientAppState state) {
+  if (state == ShellIntegration::IS_DEFAULT_CLIENT_APP)
     return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
-  if (state == ShellIntegration::NOT_DEFAULT_BROWSER)
+  if (state == ShellIntegration::NOT_DEFAULT_CLIENT_APP)
     return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
   return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
 }
 
-void BrowserOptionsHandler::SetDefaultBrowserUIState(
-    ShellIntegration::DefaultBrowserUIState state) {
+void BrowserOptionsHandler::SetDefaultClientAppUIState(
+    ShellIntegration::DefaultClientAppUIState state) {
   int status_string_id;
   if (state == ShellIntegration::STATE_IS_DEFAULT)
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;