summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 21:46:17 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 21:46:17 +0000
commit2ca113a46d9d8fe80324f1cce0c28c5142b7441a (patch)
tree7468dba92bd63b5899b14c12b46c2beef7525368 /chrome
parent3e9c89ffd4b0ed52e2f6815fcfb2a1602b4340b1 (diff)
downloadchromium_src-2ca113a46d9d8fe80324f1cce0c28c5142b7441a.zip
chromium_src-2ca113a46d9d8fe80324f1cce0c28c5142b7441a.tar.gz
chromium_src-2ca113a46d9d8fe80324f1cce0c28c5142b7441a.tar.bz2
File missing from previous recommit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 13ca661..d6a51ab 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -284,9 +284,12 @@ void Browser::CreateBrowserWindow() {
return;
if (local_state->IsPrefRegistered(prefs::kShouldShowFirstRunBubble) &&
local_state->GetBoolean(prefs::kShouldShowFirstRunBubble)) {
+ bool show_OEM_bubble = (local_state->
+ IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble) &&
+ local_state->GetBoolean(prefs::kShouldUseOEMFirstRunBubble));
// Reset the preference so we don't show the bubble for subsequent windows.
local_state->ClearPref(prefs::kShouldShowFirstRunBubble);
- window_->GetLocationBar()->ShowFirstRunBubble();
+ window_->GetLocationBar()->ShowFirstRunBubble(show_OEM_bubble);
}
FindBar* find_bar = BrowserWindow::CreateFindBar(this);