summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorchocobo@google.com <chocobo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 19:50:50 +0000
committerchocobo@google.com <chocobo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 19:50:50 +0000
commit46e55d2673f99087d7a5ba8159aea9b01239938c (patch)
tree966bfc872299abc4de49e0e8fca4d39ce07263fd /chrome/browser
parent8dfed07a82751ffa592f63686e9379f003c18da1 (diff)
downloadchromium_src-46e55d2673f99087d7a5ba8159aea9b01239938c.zip
chromium_src-46e55d2673f99087d7a5ba8159aea9b01239938c.tar.gz
chromium_src-46e55d2673f99087d7a5ba8159aea9b01239938c.tar.bz2
Map ctrl+, to open options settings page for Chrome OS.
TEST=none BUG=none Review URL: http://codereview.chromium.org/267095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index cb8feee..444680b 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1221,9 +1221,8 @@ void Browser::OpenExtensionsTab() {
#if defined(OS_CHROMEOS)
void Browser::ShowControlPanel() {
- GURL url("http://localhost:8080");
- AddTabWithURL(url, GURL(), PageTransition::AUTO_BOOKMARK, true, -1,
- false, NULL);
+ UserMetrics::RecordAction(L"ShowControlPanel", profile_);
+ ShowOptionsWindow(OPTIONS_PAGE_SETTINGS, OPTIONS_GROUP_NONE, profile_);
}
#endif