diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-16 21:40:38 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-16 21:40:38 +0000 |
| commit | 3e9c89ffd4b0ed52e2f6815fcfb2a1602b4340b1 (patch) | |
| tree | e795cabe92206ff7bb8ad35dce3d87dc7cd41105 /chrome/browser/first_run.cc | |
| parent | 37d780293564b0c6178a4bfa25de302e3e5834d4 (diff) | |
| download | chromium_src-3e9c89ffd4b0ed52e2f6815fcfb2a1602b4340b1.zip chromium_src-3e9c89ffd4b0ed52e2f6815fcfb2a1602b4340b1.tar.gz chromium_src-3e9c89ffd4b0ed52e2f6815fcfb2a1602b4340b1.tar.bz2 | |
Recommit for MirandaC of Smaller alternate first run bubble. http://codereview.chromium.org/115265 BUG=9223 TBR=mirandac
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run.cc')
| -rw-r--r-- | chrome/browser/first_run.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc index 7dbb3df..3a24488 100644 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run.cc @@ -266,6 +266,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, } } + if (parse_result & installer_util::MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE) + FirstRun::SetOEMFirstRunBubblePref(); + FilePath user_prefs = FilePath::FromWStringHack( GetDefaultPrefFilePath(true, user_data_dir.ToWStringHack())); if (user_prefs.empty()) @@ -640,6 +643,18 @@ bool FirstRun::SetShowFirstRunBubblePref() { return true; } +bool FirstRun::SetOEMFirstRunBubblePref() { + PrefService* local_state = g_browser_process->local_state(); + if (!local_state) + return false; + if (!local_state->IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble)) { + local_state->RegisterBooleanPref(prefs::kShouldUseOEMFirstRunBubble, + false); + local_state->SetBoolean(prefs::kShouldUseOEMFirstRunBubble, true); + } + return true; +} + bool FirstRun::SetShowWelcomePagePref() { PrefService* local_state = g_browser_process->local_state(); if (!local_state) |