diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 22:32:06 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 22:32:06 +0000 |
| commit | 5dcbc02fef541561a2ff97a73e231fe751e05829 (patch) | |
| tree | 7b409ff83b05bd599de7b84bc367391853348e15 /chrome/browser/browser.cc | |
| parent | 67afac662aa2d527a5993fa9eaf5b8f52ebe73e1 (diff) | |
| download | chromium_src-5dcbc02fef541561a2ff97a73e231fe751e05829.zip chromium_src-5dcbc02fef541561a2ff97a73e231fe751e05829.tar.gz chromium_src-5dcbc02fef541561a2ff97a73e231fe751e05829.tar.bz2 | |
Split chromeos options page into system and internet.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/548152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index d6d9122..88c9c6e 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -4,6 +4,9 @@ #include "chrome/browser/browser.h" +#include <algorithm> +#include <string> + #include "app/animation.h" #include "app/l10n_util.h" #include "base/base_paths.h" @@ -1322,9 +1325,14 @@ void Browser::OpenThemeGalleryTabAndActivate() { } #if defined(OS_CHROMEOS) -void Browser::ShowControlPanel() { - UserMetrics::RecordAction("ShowControlPanel", profile_); - ShowOptionsWindow(OPTIONS_PAGE_SETTINGS, OPTIONS_GROUP_NONE, profile_); +void Browser::OpenSystemOptionsDialog() { + UserMetrics::RecordAction("OpenSystemOptionsDialog", profile_); + ShowOptionsWindow(OPTIONS_PAGE_SYSTEM, OPTIONS_GROUP_NONE, profile_); +} + +void Browser::OpenInternetOptionsDialog() { + UserMetrics::RecordAction("OpenInternetOptionsDialog", profile_); + ShowOptionsWindow(OPTIONS_PAGE_INTERNET, OPTIONS_GROUP_NONE, profile_); } #endif @@ -1420,7 +1428,7 @@ void Browser::ExecuteCommandWithDisposition( if (block_command_execution_) { // We actually only allow no more than one blocked command, otherwise some // commands maybe lost. - DCHECK(last_blocked_command_id_ == -1); + DCHECK_EQ(last_blocked_command_id_, -1); last_blocked_command_id_ = id; last_blocked_command_disposition_ = disposition; return; @@ -1578,7 +1586,8 @@ void Browser::ExecuteCommandWithDisposition( case IDC_ABOUT: OpenAboutChromeDialog(); break; case IDC_HELP_PAGE: OpenHelpTab(); break; #if defined(OS_CHROMEOS) - case IDC_CONTROL_PANEL: ShowControlPanel(); break; + case IDC_SYSTEM_OPTIONS: OpenSystemOptionsDialog(); break; + case IDC_INTERNET_OPTIONS: OpenInternetOptionsDialog(); break; #endif default: @@ -2560,7 +2569,8 @@ void Browser::InitCommandState() { enable_extensions); #if defined(OS_CHROMEOS) - command_updater_.UpdateCommandEnabled(IDC_CONTROL_PANEL, true); + command_updater_.UpdateCommandEnabled(IDC_SYSTEM_OPTIONS, true); + command_updater_.UpdateCommandEnabled(IDC_INTERNET_OPTIONS, true); #endif // Initialize other commands based on the window type. |