summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 22:02:05 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 22:02:05 +0000
commit591a792d1a074fefdb9321f547b9209ebfc9e85a (patch)
tree3304bb54333c2ca31a799553a239a82d9dc3d2da /chrome/browser/browser.cc
parentd7d6ad4cece22e87bcdabc8b2eb9abe6fd71fcca (diff)
downloadchromium_src-591a792d1a074fefdb9321f547b9209ebfc9e85a.zip
chromium_src-591a792d1a074fefdb9321f547b9209ebfc9e85a.tar.gz
chromium_src-591a792d1a074fefdb9321f547b9209ebfc9e85a.tar.bz2
chromeos: Add Ctrl-/ accelerator for help app.
This adds Ctrl-/ and Ctrl-Shift-/ (Ctrl-?) accelerators for the help command in Views GTK, updates the help URL for Chrome OS, and makes us print "/" explicitly in accelerator descriptions instead of "slash" (the string we get from GDK). BUG=chromium-os:7835 TEST=built and ran it Review URL: http://codereview.chromium.org/4156004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 053c4f2..12d2338 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -141,8 +141,13 @@ using base::TimeDelta;
static const int kUIUpdateCoalescingTimeMS = 200;
// The URL to be loaded to display Help.
+#if defined(OS_CHROMEOS)
+static const char* const kHelpContentUrl =
+ "chrome-extension://nifaohjgppdbmalmmgkmfdlodaggnbpe/main.html";
+#else
static const char* const kHelpContentUrl =
"http://www.google.com/support/chrome/";
+#endif
// The URL to be loaded to display the "Report a broken page" form.
static const std::string kBrokenPageUrl =