Implement the new first run bubble, clean up old bubbles.

chrome/browser/first_run/first_run.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/first_run/first_run.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 220 matching lines @@
   if (IsOrganicFirstRun() && !local_state_file_exists) {
     // The home page string may be set in the preferences, but the user should
     // initially use Chrome with the NTP as home page in organic builds.
     profile->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
     ShowFirstRunDialog(profile, randomize_search_engine_experiment);
   }
 
   if (make_chrome_default)
     ShellIntegration::SetAsDefaultBrowser();
 
-  // Don't display the minimal bubble if there is no default search provider.
-  TemplateURLService* search_engines_model =
+  // Display the first run bubble if there is a default search provider.
+  TemplateURLService* template_url =
       TemplateURLServiceFactory::GetForProfile(profile);
-  if (search_engines_model &&
-      search_engines_model->GetDefaultSearchProvider()) {
+  if (template_url && template_url->GetDefaultSearchProvider())
     SetShowFirstRunBubblePref(true);
-    // Set the first run bubble to minimal.
-    SetMinimalFirstRunBubblePref();
-  }
   SetShowWelcomePagePref();
   SetPersonalDataManagerFirstRunPref();
 }
 #endif  // !defined(USE_AURA)
 
 int ImportBookmarkFromFileIfNeeded(Profile* profile,
                                    const CommandLine& cmdline) {
   int return_code = true;
   if (cmdline.HasSwitch(switches::kImportFromFile)) {
     // Silently import preset bookmarks from file.
@@ skipping 33 matching lines @@
   FilePath first_run_sentinel;
   if (!internal::GetFirstRunSentinelFilePath(&first_run_sentinel))
     return false;
   return file_util::Delete(first_run_sentinel, false);
 }
 
 bool SetShowFirstRunBubblePref(bool show_bubble) {
   PrefService* local_state = g_browser_process->local_state();
   if (!local_state)
     return false;
-  if (!local_state->HasPrefPath(prefs::kShouldShowFirstRunBubble))
-    local_state->SetBoolean(prefs::kShouldShowFirstRunBubble, show_bubble);
+  local_state->SetBoolean(prefs::kShouldShowFirstRunBubble, show_bubble);
   return true;
 }
 
-bool SetMinimalFirstRunBubblePref() {
-  PrefService* local_state = g_browser_process->local_state();
-  if (!local_state)
-    return false;
-  if (!local_state->FindPreference(prefs::kShouldUseMinimalFirstRunBubble)) {
-    local_state->RegisterBooleanPref(prefs::kShouldUseMinimalFirstRunBubble,
-                                     false);
-    local_state->SetBoolean(prefs::kShouldUseMinimalFirstRunBubble, true);
-  }
-  return true;
-}
-
 bool SetShowWelcomePagePref() {
   PrefService* local_state = g_browser_process->local_state();
   if (!local_state)
     return false;
   if (!local_state->FindPreference(prefs::kShouldShowWelcomePage)) {
     local_state->RegisterBooleanPref(prefs::kShouldShowWelcomePage, false);
     local_state->SetBoolean(prefs::kShouldShowWelcomePage, true);
   }
   return true;
 }
 
 bool SetPersonalDataManagerFirstRunPref() {
   PrefService* local_state = g_browser_process->local_state();
   if (!local_state)
     return false;
   if (!local_state->FindPreference(
           prefs::kAutofillPersonalDataManagerFirstRun)) {
     local_state->RegisterBooleanPref(
         prefs::kAutofillPersonalDataManagerFirstRun, false);
     local_state->SetBoolean(prefs::kAutofillPersonalDataManagerFirstRun, true);
   }
   return true;
 }
 
-bool SetOEMFirstRunBubblePref() {
-  PrefService* local_state = g_browser_process->local_state();
-  if (!local_state)
-    return false;
-  if (!local_state->FindPreference(prefs::kShouldUseOEMFirstRunBubble)) {
-    local_state->RegisterBooleanPref(prefs::kShouldUseOEMFirstRunBubble, false);
-    local_state->SetBoolean(prefs::kShouldUseOEMFirstRunBubble, true);
-  }
-  return true;
-}
-
 bool ShouldShowSearchEngineSelector(const TemplateURLService* model) {
   return model && !model->is_default_search_managed();
 }
 
 }  // namespace first_run
 
 // FirstRun -------------------------------------------------------------------
 
 FirstRun::MasterPrefs::MasterPrefs()
     : ping_delay(0),
@@ skipping 55 matching lines @@
         VLOG(1) << "EULA : no collection";
         GoogleUpdateSettings::SetCollectStatsConsent(false);
       } else if (retcode == installer::EULA_ACCEPTED_OPT_IN) {
         VLOG(1) << "EULA : collection consent";
         GoogleUpdateSettings::SetCollectStatsConsent(true);
       }
     }
   }
 #endif
 
-  if (prefs.GetBool(installer::master_preferences::kAltFirstRunBubble,
-                    &value) && value) {
-    first_run::SetOEMFirstRunBubblePref();
-  }
-
   FilePath user_prefs = GetDefaultPrefFilePath(true, user_data_dir);
   if (user_prefs.empty())
     return true;
 
   // The master prefs are regular prefs so we can just copy the file
   // to the default place and they just work.
   if (!file_util::CopyFile(master_prefs, user_prefs))
     return true;
 
 #if defined(OS_WIN)
@@ skipping 154 matching lines @@
     }
   } else {
     if (g_browser_process->local_state()->GetBoolean(
             prefs::kDefaultBrowserSettingEnabled)) {
       ShellIntegration::SetAsDefaultBrowser();
     }
   }
 
   return false;
 }