Support for interactive set-chrome-as-default in Windows.

chrome/browser/ui/webui/options2/browser_options_handler2.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/ui/webui/options2/browser_options_handler2.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 661 matching lines @@
 
     base::FundamentalValue enabled(will_launch_at_login);
     web_ui()->CallJavascriptFunction("BrowserOptions.updateAutoLaunchState",
                                      enabled);
   }
 #endif
 }
 
 void BrowserOptionsHandler::UpdateDefaultBrowserState() {
   // Check for side-by-side first.
-  if (!ShellIntegration::CanSetAsDefaultBrowser()) {
+  if (ShellIntegration::CanSetAsDefaultBrowser() ==
+          ShellIntegration::CHANGE_DEFAULT_NOT_ALLOWED) {
     SetDefaultBrowserUIString(IDS_OPTIONS_DEFAULTBROWSER_SXS);
     return;
   }
 
 #if defined(OS_MACOSX)
   ShellIntegration::DefaultWebClientState state =
       ShellIntegration::IsDefaultBrowser();
   int status_string_id;
   if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT)
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
   else if (state == ShellIntegration::NOT_DEFAULT_WEB_CLIENT)
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
   else
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
 
   SetDefaultBrowserUIString(status_string_id);
 #else
   default_browser_worker_->StartCheckIsDefault();
 #endif
 }
 
 void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {
   // If the default browser setting is managed then we should not be able to
   // call this function.
   if (default_browser_policy_.IsManaged())
     return;
 
-  content::RecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"));
+  if (ShellIntegration::CanSetAsDefaultBrowser() ==
+          ShellIntegration::CHANGE_DEFAULT_INTERACTIVE) {
+    // Interactive operation (a dialog has to be shown).
+    content::RecordAction(
+        UserMetricsAction("Options_ShowSetAsDefaultBrowser"));

[grt (UTC plus 2), 2012/05/28 20:47:02]

i don't know how these UserMetrics stuff work.  do these new action names need
to be registered somewhere else?

[motek., 2012/05/31 21:59:04]

Ack. This is gone. Do you think I should somehow specifically gather metrics for
that? 

+    if (!ShellIntegration::StartSetAsDefaultBrowserInteractive()) {
+      content::RecordAction(
+          UserMetricsAction("Options_SetAsDefaultBrowserCancelled"));

[grt (UTC plus 2), 2012/05/28 20:47:02]

the comment for StartSetAsDefaultBrowserInteractive doesn't indicate that a
return value of false means that the user cancelled it.  is this metrics action
correct, or should the comment be updated?

[motek., 2012/05/31 21:59:04]

The comment in the other place was indeed incorrect and has been update. Still,
I am not sure if we would even care about these stats...

+      return;  // No updates needed.
+    }
+    UpdateDefaultBrowserState();

[grt (UTC plus 2), 2012/05/28 20:47:02]

hmm, this makes me think that StartSetAsDefaultBrowserInteractive is a blocking
call (otherwise i wouldn't expect that it makes sense to update the state here).

[motek., 2012/05/31 21:59:04]

You are correct. But there was another problem here and this code is now all
gone, rolled into ShellIntegration.

+  } else {
+    content::RecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"));
 #if defined(OS_MACOSX)
-  if (ShellIntegration::SetAsDefaultBrowser())
-    UpdateDefaultBrowserState();
+    if (ShellIntegration::SetAsDefaultBrowser())
+      UpdateDefaultBrowserState();
 #else
-  default_browser_worker_->StartSetAsDefault();
-  // Callback takes care of updating UI.
+    default_browser_worker_->StartSetAsDefault();
+    // Callback takes care of updating UI.
 #endif
+  }
 
   // If the user attempted to make Chrome the default browser, then he/she
   // arguably wants to be notified when that changes.
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   prefs->SetBoolean(prefs::kCheckDefaultBrowser, true);
 }
 
 int BrowserOptionsHandler::StatusStringIdForState(
     ShellIntegration::DefaultWebClientState state) {
   if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT)
@@ skipping 693 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2