Revert 184588 because it leaves the Exit menu disabled on all platforms.

ash/accelerators/accelerator_table.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_table.h"
 
 #include "base/basictypes.h"
 
 namespace ash {
 
@@ skipping 68 matching lines @@
   { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
 #endif  // !defined(NDEBUG)
   { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG },
   { true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     OPEN_FILE_MANAGER },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
   { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     DISABLE_GPU_WATCHDOG },
 #endif  // defined(OS_CHROMEOS)
   { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
-#if !defined(OS_WIN)
   { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
-#endif
   { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     TOGGLE_SPOKEN_FEEDBACK },
   { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     TOUCH_HUD_MODE_CHANGE },
   { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
     TOUCH_HUD_CLEAR },
 
   // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
   // NEW_TAB, you also need to modify
   // ToolbarView::GetAcceleratorForCommandId() in
@@ skipping 194 matching lines @@
   CYCLE_FORWARD_LINEAR,
   CYCLE_FORWARD_MRU,
   TOGGLE_MAXIMIZED,
   WINDOW_MINIMIZE,
 };
 
 const size_t kNonrepeatableActionsLength =
     arraysize(kNonrepeatableActions);
 
 }  // namespace ash