rollback of r 162411

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16242 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 8 deletions

diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index 9e440af..d376456 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -69,8 +69,6 @@ const wchar_t kVerboseLogging[] = L"verbose_logging";
 const wchar_t kRequireEula[] = L"require_eula";
 // Use alternate shortcut text for the main shortcut.
 const wchar_t kAltShortcutText[] = L"alternate_shortcut_text";
-// Use alternate smaller first run info bubble.
-const wchar_t kAltFirstRunBubble[] = L"oem_bubble";
 
 
 int ParseDistributionPreferences(const std::wstring& master_prefs_path) {
@@ -111,8 +109,6 @@ int ParseDistributionPreferences(const std::wstring& master_prefs_path) {
       parse_result |= MASTER_PROFILE_REQUIRE_EULA;
     if (GetBooleanPref(distro, kAltShortcutText))
       parse_result |= MASTER_PROFILE_ALT_SHORTCUT_TXT;
-    if (GetBooleanPref(distro, kAltFirstRunBubble))
-      parse_result |= MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE;
   }
   return parse_result;
 }
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index 46513e9..14426f1 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -53,9 +53,7 @@ enum MasterPrefResult {
   // Show the EULA and do not install if not accepted.
   MASTER_PROFILE_REQUIRE_EULA                  = 0x1 << 13,
   // Use an alternate description text for some shortcuts.
-  MASTER_PROFILE_ALT_SHORTCUT_TXT              = 0x1 << 14,
-  // Use a smaller OEM info bubble on first run.
-  MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE          = 0x1 << 15
+  MASTER_PROFILE_ALT_SHORTCUT_TXT              = 0x1 << 14
 };
 
 // The master preferences is a JSON file with the same entries as the
@@ -103,7 +101,7 @@ int ParseDistributionPreferences(const std::wstring& master_prefs_path);
 // As part of the master preferences an optional section indicates the tabs
 // to open during first run. An example is the following:
 //
-//  {
+//  { 
 //    "first_run_tabs": [
 //       "http://google.com/f1",
 //       "https://google.com/f2"