diff options
author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 05:08:05 +0000 |
---|---|---|
committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 05:08:05 +0000 |
commit | 024617a569d5a45e6aaa61d73895d731ade5041c (patch) | |
tree | 075fe8fe139af7be5f207776967e1be369f48f99 /chrome/browser/views/first_run_bubble.cc | |
parent | dcaebdd4d8bf59d322aafc9cb45520db56f931c7 (diff) | |
download | chromium_src-024617a569d5a45e6aaa61d73895d731ade5041c.zip chromium_src-024617a569d5a45e6aaa61d73895d731ade5041c.tar.gz chromium_src-024617a569d5a45e6aaa61d73895d731ade5041c.tar.bz2 |
Changed ChromeOS status bar menu handlers to obey --enable-tabbed-options switch and display the new DOM UI when it's used.
BUG=chromium-os:5522
TEST=make sure the new DOM UI option tab opens from status bar drop down menues (language, internet and system settings)
Review URL: http://codereview.chromium.org/3142020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/first_run_bubble.cc')
-rw-r--r-- | chrome/browser/views/first_run_bubble.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 01457e6..0fa0893 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -13,7 +13,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/search_engines/util.h" #include "chrome/browser/metrics/user_metrics.h" #include "grit/chromium_strings.h" @@ -149,10 +148,10 @@ void FirstRunBubbleView::ButtonPressed(views::Button* sender, UserMetrics::RecordAction( UserMetricsAction("FirstRunBubbleView_ChangeButton"), profile_); + Browser* browser = BrowserList::GetLastActive(); if (browser) { - ShowOptionsWindow(OPTIONS_PAGE_GENERAL, OPTIONS_GROUP_DEFAULT_SEARCH, - browser->profile()); + browser->OpenSearchEngineOptionsDialog(); } } } |