Merge 198707 "Record first run startup metrics."

chrome/browser/ui/cocoa/first_run_dialog.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/first_run_dialog.h"
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 60 matching lines @@
 }
 
 void FirstRunShowBridge::ShowDialog() {
   [controller_ show];
   MessageLoop::current()->QuitNow();
 }
 
 FirstRunShowBridge::~FirstRunShowBridge() {}
 
 // Show the first run UI.
-void ShowFirstRun(Profile* profile) {
+// Returns true if the first run dialog was shown.
+bool ShowFirstRun(Profile* profile) {
+  bool dialog_shown = false;
 #if defined(GOOGLE_CHROME_BUILD)
   // The purpose of the dialog is to ask the user to enable stats and crash
   // reporting. This setting may be controlled through configuration management
   // in enterprise scenarios. If that is the case, skip the dialog entirely, as
   // it's not worth bothering the user for only the default browser question
   // (which is likely to be forced in enterprise deployments anyway).
   const PrefService::Preference* metrics_reporting_pref =
       g_browser_process->local_state()->FindPreference(
           prefs::kMetricsReportingEnabled);
   if (!metrics_reporting_pref || !metrics_reporting_pref->IsManaged()) {
     scoped_nsobject<FirstRunDialogController> dialog(
         [[FirstRunDialogController alloc] init]);
 
     [dialog.get() showWindow:nil];
+    dialog_shown = true;
 
     // If the dialog asked the user to opt-in for stats and crash reporting,
     // record the decision and enable the crash reporter if appropriate.
     bool stats_enabled = [dialog.get() statsEnabled];
     GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled);
 
     // Breakpad is normally enabled very early in the startup process.  However,
     // on the first run it may not have been enabled due to the missing opt-in
     // from the user.  If the user agreed now, enable breakpad if necessary.
     if (!IsCrashReporterEnabled() && stats_enabled) {
@@ skipping 16 matching lines @@
 
   // Set preference to show first run bubble and welcome page.
   // Only display the bubble if there is a default search provider.
   TemplateURLService* search_engines_model =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (search_engines_model &&
       search_engines_model->GetDefaultSearchProvider()) {
     first_run::SetShowFirstRunBubblePref(first_run::FIRST_RUN_BUBBLE_SHOW);
   }
   first_run::SetShouldShowWelcomePage();
+
+  return dialog_shown;
 }
 
 // True when the stats checkbox should be checked by default. This is only
 // the case when the canary is running.
 bool StatsCheckboxDefault() {
   return chrome::VersionInfo::GetChannel() ==
       chrome::VersionInfo::CHANNEL_CANARY;
 }
 
 }  // namespace
 
 namespace first_run {
 
-void ShowFirstRunDialog(Profile* profile) {
-  ShowFirstRun(profile);
+bool ShowFirstRunDialog(Profile* profile) {
+  return ShowFirstRun(profile);
 }
 
 }  // namespace first_run
 
 @implementation FirstRunDialogController
 
 @synthesize statsEnabled = statsEnabled_;
 @synthesize makeDefaultBrowser = makeDefaultBrowser_;
 
 - (id)init {
@@ skipping 129 matching lines @@
   [NSApp stopModal];
 }
 
 - (IBAction)learnMore:(id)sender {
   NSString* urlStr = base::SysUTF8ToNSString(chrome::kLearnMoreReportingURL);
   NSURL* learnMoreUrl = [NSURL URLWithString:urlStr];
   [[NSWorkspace sharedWorkspace] openURL:learnMoreUrl];
 }
 
 @end