Commit for Miranda.

http://codereview.chromium.org/115265

Original text:
"""
This addresses 3 of the 4 issues described in Issue 9223: 

1) Creates a new streamlined bubble with less text.
2) Incorporates a close [x].
3) Driven by configuration option in master_preferences file; this alternate
   bubble will be used only if "oem_bubble": true is set.

Requested longer linger time feature will involve mucking with the focus 
manager; this change will be uploaded separately.

BUG=9223
TEST=Add "oem_bubble": true to master_preferences file.  Run chrome with
--first-run option.  Alternate, smaller OEM bubble should appear over the Chrome
browser in the place of the standard first-run bubble.
"""


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

1 files changed, 4 insertions, 0 deletions

diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index d376456..9e440af 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -69,6 +69,8 @@ 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) {
@@ -109,6 +111,8 @@ 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;
 }