Make the histograms for setting the default browser consistent

chrome/browser/shell_integration.h

 // 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.
 
 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
 #define CHROME_BROWSER_SHELL_INTEGRATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 192 matching lines @@
     // SetAsDefault.
     virtual void OnSetAsDefaultConcluded(bool succeeded) {}
     // Observer classes that return true to OwnedByWorker are automatically
     // freed by the worker when they are no longer needed. False by default.
     virtual bool IsOwnedByWorker();
     // An observer can permit or decline set-as-default operation if it
     // requires triggering user interaction. By default not allowed.
     virtual bool IsInteractiveSetDefaultPermitted();
   };
 
+  // The locations from which the user can set Chrome as the default browser.
+  // This enum is used for UMA. Do not modify the ordering.
+  enum SetDefaultBrowserLocation {
+    INFO_BAR,
+    SETTINGS,
+    NUM_SET_DEFAULT_BROWSER_LOCATION_TYPES
+  };
+
   //  Helper objects that handle checking if Chrome is the default browser
   //  or application for a url protocol on Windows and Linux, and also setting
   //  it as the default. These operations are performed asynchronously on the
   //  file thread since registry access (on Windows) or the preference database
   //  (on Linux) are involved and this can be slow.
   class DefaultWebClientWorker
       : public base::RefCountedThreadSafe<DefaultWebClientWorker> {
    public:
     explicit DefaultWebClientWorker(DefaultWebClientObserver* observer);
 
     // Checks to see if Chrome is the default web client application. The result
     // will be passed back to the observer via the SetDefaultWebClientUIState
     // function. If there is no observer, this function does not do anything.
     void StartCheckIsDefault();
 
     // Sets Chrome as the default web client application. If there is an
     // observer, once the operation has completed the new default will be
     // queried and the current status reported via SetDefaultWebClientUIState.
     void StartSetAsDefault();
 
     // Called to notify the worker that the view is gone.
     void ObserverDestroyed();
 
    protected:
     friend class base::RefCountedThreadSafe<DefaultWebClientWorker>;
 
     // Possible result codes for a set-as-default operation.
     // Do not modify the ordering as it is important for UMA.
     enum AttemptResult {
-      // No errors encountered.
+      // Chrome was set as the default browser.
       SUCCESS,
       // Chrome was already the default web client. This counts as a successful
       // attempt.
       ALREADY_DEFAULT,
       // Chrome was not set as the default web client.
       FAILURE,
       // The attempt was abandoned because the observer was destroyed.
       ABANDONED,
       // Failed to launch the process to set Chrome as the default web client
       // asynchronously.
       LAUNCH_FAILURE,
       // Another worker is already in progress to make Chrome the default web
       // client.
       OTHER_WORKER,
       // The user initiated another attempt while the asynchronous operation was
       // already in progress.
       RETRY,
+      // No errors were encountered yet Chrome is still not the default browser.
+      NO_ERRORS_NOT_DEFAULT,
       NUM_ATTEMPT_RESULT_TYPES
     };
 
     virtual ~DefaultWebClientWorker();
 
     // Communicates the result to the observer. In contrast to
     // OnSetAsDefaultAttemptComplete(), this should not be called multiple
     // times.
     void OnCheckIsDefaultComplete(DefaultWebClientState state);
 
@@ skipping 46 matching lines @@
     DefaultWebClientObserver* observer_;
 
     // Flag that indicates the return value of InitializeSetAsDefault(). If
     // true, FinalizeSetAsDefault() will be called to clear what was
     // initialized.
     bool set_as_default_initialized_ = false;
 
     // Records the time it takes to set the default browser.
     base::TimeTicks start_time_;
 
+#if defined(OS_WIN)
+    // Wait until Chrome has been confirmed as the default browser before
+    // reporting a successful attempt.
+    bool check_default_should_report_success_ = false;
+#endif  // defined(OS_WIN)
+
     DISALLOW_COPY_AND_ASSIGN(DefaultWebClientWorker);
   };
 
   // Worker for checking and setting the default browser.
   class DefaultBrowserWorker : public DefaultWebClientWorker {
    public:
     explicit DefaultBrowserWorker(DefaultWebClientObserver* observer);
 
    private:
     ~DefaultBrowserWorker() override;
@@ skipping 45 matching lines @@
     // Set Chrome as the default handler for this protocol.
     void SetAsDefault(bool interactive_permitted) override;
 
     std::string protocol_;
 
     DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker);
   };
 };
 
 #endif  // CHROME_BROWSER_SHELL_INTEGRATION_H_