summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-31 04:08:35 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-31 04:08:35 +0000
commit12713f4bfd3d0d6a9c8dc9819211d6ccb091d992 (patch)
treedfe8eb3daeb33646054732339ac51a42a93013cf
parent39315f84aa485c7647660599a66e5a8259efc2b8 (diff)
downloadchromium_src-12713f4bfd3d0d6a9c8dc9819211d6ccb091d992.zip
chromium_src-12713f4bfd3d0d6a9c8dc9819211d6ccb091d992.tar.gz
chromium_src-12713f4bfd3d0d6a9c8dc9819211d6ccb091d992.tar.bz2
Don't crash on find on OS X and Linux. Bug introduced by r17285.
BUG=none TEST=Hit ctrl-f in Linux or OS X and check that chrome doesn't crash. Review URL: http://codereview.chromium.org/115979 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17298 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 129286f..f349ec9 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -281,7 +281,7 @@ void Browser::CreateBrowserWindow() {
window_->GetLocationBar()->ShowFirstRunBubble(show_OEM_bubble);
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || !defined(TOOLKIT_VIEWS)
FindBar* find_bar = BrowserWindow::CreateFindBar(this);
find_bar_controller_.reset(new FindBarController(find_bar));
find_bar->SetFindBarController(find_bar_controller_.get());