kiosk: Disable Ctrl+W and Ctrl+Shift+Q shortcut.

BUG=339223

Review URL: https://codereview.chromium.org/140123009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247968 0039d316-1c4b-4281-b951-d872f2087c98

ash/accelerators/accelerator_table.cc

@@ -376,7 +376,6 @@ const AcceleratorAction kActionsAllowedInAppMode[] = {
   CYCLE_FORWARD_MRU,
   CYCLE_LINEAR,
   DISABLE_CAPS_LOCK,
-  EXIT,
   KEYBOARD_BRIGHTNESS_DOWN,
   KEYBOARD_BRIGHTNESS_UP,
   MAGNIFY_SCREEN_ZOOM_IN,  // Control+F7

chrome/browser/ui/views/apps/native_app_window_views.cc

@@ -11,6 +11,7 @@
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ -301,9 +302,13 @@ void NativeAppWindowViews::InitializeDefaultWindow(
   views::FocusManager* focus_manager = GetFocusManager();
   const std::map<ui::Accelerator, int>& accelerator_table =
       GetAcceleratorTable();
+  const bool is_kiosk_app_mode = chrome::IsRunningInForcedAppMode();
   for (std::map<ui::Accelerator, int>::const_iterator iter =
            accelerator_table.begin();
        iter != accelerator_table.end(); ++iter) {
+    if (is_kiosk_app_mode && !chrome::IsCommandAllowedInAppMode(iter->second))
+      continue;
+
     focus_manager->RegisterAccelerator(
         iter->first, ui::AcceleratorManager::kNormalPriority, this);
   }