diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-16 20:50:23 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-16 20:50:23 +0000 |
| commit | c9d01f92e082319a59215e2e812ca94168704695 (patch) | |
| tree | da17f05c8432cee9665969a8be7d5a090f43dbe5 /chrome/installer | |
| parent | de54a5f6e53a3aa2cd218cb5f19aaf205af382d5 (diff) | |
| download | chromium_src-c9d01f92e082319a59215e2e812ca94168704695.zip chromium_src-c9d01f92e082319a59215e2e812ca94168704695.tar.gz chromium_src-c9d01f92e082319a59215e2e812ca94168704695.tar.bz2 | |
Commit for MirandaC of Smaller alternate first run bubble. http://codereview.chromium.org/115265
BUG=9223
TBR=mirandac
Review URL: http://codereview.chromium.org/113504
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/master_preferences.cc | 4 | ||||
| -rw-r--r-- | chrome/installer/util/master_preferences.h | 6 |
2 files changed, 8 insertions, 2 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; } diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h index 14426f1..46513e9 100644 --- a/chrome/installer/util/master_preferences.h +++ b/chrome/installer/util/master_preferences.h @@ -53,7 +53,9 @@ 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 + MASTER_PROFILE_ALT_SHORTCUT_TXT = 0x1 << 14, + // Use a smaller OEM info bubble on first run. + MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE = 0x1 << 15 }; // The master preferences is a JSON file with the same entries as the @@ -101,7 +103,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" |