diff options
Diffstat (limited to 'chrome')
4 files changed, 16 insertions, 6 deletions
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc index 56d7d24..8aad0a4 100644 --- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/extensions/app_launch_params.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" @@ -40,7 +41,13 @@ void ChromeNewWindowDelegateChromeos::OpenFileManager() { service->GetInstalledExtension(kFileManagerAppId); OpenApplication(AppLaunchParams(profile, extension, CURRENT_TAB, chrome::HOST_DESKTOP_TYPE_ASH, - extensions::SOURCE_CHROME_INTERNAL)); + extensions::SOURCE_KEYBOARD)); +} + +void ChromeNewWindowDelegateChromeos::OpenGetHelp() { + Profile* const profile = ProfileManager::GetActiveUserProfile(); + chrome::ShowHelpForProfile( + profile, chrome::HOST_DESKTOP_TYPE_ASH, chrome::HELP_SOURCE_KEYBOARD); } void ChromeNewWindowDelegateChromeos::OpenCrosh() { diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h index b8a46ba..e53a7da 100644 --- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h @@ -15,6 +15,7 @@ class ChromeNewWindowDelegateChromeos : public ChromeNewWindowDelegate { // Overridden from ash::NewWindowDelegate: virtual void OpenFileManager() override; virtual void OpenCrosh() override; + virtual void OpenGetHelp() override; virtual void ShowKeyboardOverlay() override; private: diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc index 5e0703c..de13bd2 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc @@ -44,6 +44,7 @@ class NewWindowDelegateImpl : public ChromeNewWindowDelegate { // Overridden from ash::NewWindowDelegate: void OpenFileManager() override {} void OpenCrosh() override {} + void OpenGetHelp() override {} void ShowKeyboardOverlay() override {} private: diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index 38db3cd..156dd9b 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc @@ -56,13 +56,14 @@ TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) { const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i]; if (!ash_entry.trigger_on_press) continue; // kAcceleratorMap does not have any release accelerators. - // The shortcuts to toggle minimized state, to show the task manager, and - // to toggle touch HUD are defined on browser side as well as ash side by - // design so that web contents can consume these short cuts. (see - // crbug.com/309915, 370019, 412435 and CL) + // The shortcuts to toggle minimized state, to show the task manager, + // to toggle touch HUD, and to open help page are defined on browser side + // as well as ash side by design so that web contents can consume these + // short cuts. (see crbug.com/309915, 370019, 412435, 321568 and CL) if (ash_entry.action == ash::WINDOW_MINIMIZE || ash_entry.action == ash::SHOW_TASK_MANAGER || - ash_entry.action == ash::TOUCH_HUD_PROJECTION_TOGGLE) + ash_entry.action == ash::TOUCH_HUD_PROJECTION_TOGGLE || + ash_entry.action == ash::OPEN_GET_HELP) continue; AcceleratorMapping entry; entry.keycode = ash_entry.keycode; |