Remove the first-run search engine dialog/ballot.

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"
 #import "base/memory/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/shell_integration.h"
-#import "chrome/browser/ui/cocoa/search_engine_dialog_controller.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/locale_settings.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 #import "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 33 matching lines @@
 
 FirstRunShowBridge::FirstRunShowBridge(
     FirstRunDialogController* controller) : controller_(controller) {
 }
 
 void FirstRunShowBridge::ShowDialog() {
   [controller_ show];
   MessageLoop::current()->QuitNow();
 }
 
-// Show the search engine selection dialog.
-void ShowSearchEngineSelectionDialog(Profile* profile,
-                                     bool randomize_search_engine_experiment) {
-  scoped_nsobject<SearchEngineDialogController> dialog(
-      [[SearchEngineDialogController alloc] init]);
-  [dialog.get() setProfile:profile];
-  [dialog.get() setRandomize:randomize_search_engine_experiment];
-
-  [dialog.get() showWindow:nil];
-}
-
 // Show the first run UI.
 void ShowFirstRun(Profile* profile) {
 #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(
@@ skipping 24 matching lines @@
       DCHECK(success);
     }
   }
 #else  // GOOGLE_CHROME_BUILD
   // We don't show the dialog in Chromium.
 #endif  // GOOGLE_CHROME_BUILD
 
   first_run::CreateSentinel();
 
   // Set preference to show first run bubble and welcome page.
-  // Don't display the minimal bubble if there is no default search provider.
+  // 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(true);
   }
   first_run::SetShowWelcomePagePref();
 }
 
 // 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,
-                        bool randomize_search_engine_experiment) {
-  // If the default search is not managed via policy, ask the user to
-  // choose a default.
-  TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(profile);
-  if (first_run::ShouldShowSearchEngineSelector(model)) {
-    ShowSearchEngineSelectionDialog(profile,
-                                    randomize_search_engine_experiment);
-  }
+void ShowFirstRunDialog(Profile* profile) {
   ShowFirstRun(profile);
 }
 
 }  // namespace first_run
 
 @implementation FirstRunDialogController
 
 @synthesize statsEnabled = statsEnabled_;
 @synthesize makeDefaultBrowser = makeDefaultBrowser_;
 
@@ skipping 131 matching lines @@
 
 - (IBAction)learnMore:(id)sender {
   GURL url = google_util::AppendGoogleLocaleParam(
       GURL(chrome::kLearnMoreReportingURL));
   NSString* urlStr = base::SysUTF8ToNSString(url.spec());;
   NSURL* learnMoreUrl = [NSURL URLWithString:urlStr];
   [[NSWorkspace sharedWorkspace] openURL:learnMoreUrl];
 }
 
 @end