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

chrome/browser/first_run/first_run.h

Index: chrome/browser/first_run/first_run.h
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index fe541de77053a4dc588401f6aa48faef105c7911..79436b83bcb65883683aeda204c1acd1342b1309 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -55,11 +55,6 @@ bool RemoveSentinel();
 // initial call will actually set the preference.
 bool SetShowFirstRunBubblePref(bool show_bubble);
 
-// Sets the kShouldUseMinimalFirstRunBubble local state pref so that the
-// browser shows the minimal first run bubble once the main message loop
-// gets going. Returns false if the pref could not be set.
-bool SetMinimalFirstRunBubblePref();
-
 // Sets the kShouldShowWelcomePage local state pref so that the browser
 // loads the welcome tab once the message loop gets going. Returns false
 // if the pref could not be set.
@@ -102,13 +97,6 @@ int ImportNow(Profile* profile, const CommandLine& cmdline);
 // install work for this user. After that the sentinel file is created.
 class FirstRun {
  public:
-  // There are three types of possible first run bubbles:
-  enum BubbleType {
-    LARGE_BUBBLE,      // The normal bubble, with search engine choice
-    OEM_BUBBLE,        // Smaller bubble for OEM builds
-    MINIMAL_BUBBLE     // Minimal bubble shown after search engine dialog
-  };
-
   // See ProcessMasterPreferences for more info about this structure.
   struct MasterPrefs {
     MasterPrefs();
@@ -141,11 +129,6 @@ class FirstRun {
   static bool ProcessMasterPreferences(const FilePath& user_data_dir,
                                        MasterPrefs* out_prefs);
 
-  // Sets the kShouldUseOEMFirstRunBubble local state pref so that the
-  // browser shows the OEM first run bubble once the main message loop
-  // gets going. Returns false if the pref could not be set.
-  static bool SetOEMFirstRunBubblePref();
-
   // Whether the search engine selection dialog should be shown on first run.
   static bool ShouldShowSearchEngineSelector(const TemplateURLService* model);