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 2da758d8fa0ea34ad20fd8d4f963b700375423a4..0d20014cf65af56573a6049b2a4e770c75c73fac 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.
@@ -70,11 +65,6 @@ bool SetShowWelcomePagePref();
 // Returns false if the pref could not be set.
 bool SetPersonalDataManagerFirstRunPref();
 
-// 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.
-bool SetOEMFirstRunBubblePref();
-
 // Whether the search engine selection dialog should be shown on first run.
 bool ShouldShowSearchEngineSelector(const TemplateURLService* model);
 
@@ -113,13 +103,6 @@ FilePath MasterPrefsPath();
 // 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();