diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 01:29:42 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 01:29:42 +0000 |
| commit | 4a42d27f346529b37f839b27b8b1dedd7e507002 (patch) | |
| tree | 73c407a059acf1fc1252c64c201a5253135a28c2 /chrome/browser/browser.cc | |
| parent | 988506992537ed14bc02c00a2bae38088befcc0e (diff) | |
| download | chromium_src-4a42d27f346529b37f839b27b8b1dedd7e507002.zip chromium_src-4a42d27f346529b37f839b27b8b1dedd7e507002.tar.gz chromium_src-4a42d27f346529b37f839b27b8b1dedd7e507002.tar.bz2 | |
Enable domui options for use in browser using the switch:
--enable-tabbed-options
BUG=none
TEST=see description
Review URL: http://codereview.chromium.org/2820007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index dbf62e9..46518f3 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -631,6 +631,12 @@ void Browser::OpenHelpWindow(Profile* profile) { browser->OpenHelpTab(); browser->window()->Show(); } + +void Browser::OpenOptionsWindow(Profile* profile) { + Browser* browser = Browser::Create(profile); + browser->ShowOptionsTab(); + browser->window()->Show(); +} #endif // static @@ -1697,6 +1703,11 @@ void Browser::ShowBrokenPageTab(TabContents* contents) { ShowSingletonTab(GURL(report_page_url)); } +void Browser::ShowOptionsTab() { + UserMetrics::RecordAction(UserMetricsAction("ShowOptions"), profile_); + ShowSingletonTab(GURL(chrome::kChromeUIOptionsURL)); +} + void Browser::OpenClearBrowsingDataDialog() { UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"), profile_); @@ -1704,8 +1715,13 @@ void Browser::OpenClearBrowsingDataDialog() { } void Browser::OpenOptionsDialog() { - UserMetrics::RecordAction(UserMetricsAction("ShowOptions"), profile_); - ShowOptionsWindow(OPTIONS_PAGE_DEFAULT, OPTIONS_GROUP_NONE, profile_); + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableTabbedOptions)) { + ShowOptionsTab(); + } else { + UserMetrics::RecordAction(UserMetricsAction("ShowOptions"), profile_); + ShowOptionsWindow(OPTIONS_PAGE_DEFAULT, OPTIONS_GROUP_NONE, profile_); + } } void Browser::OpenKeywordEditor() { |