Unify and change logout/sleep/lock shortcuts

chrome/browser/ui/views/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 "chrome/browser/ui/views/accelerator_table.h"
 
 #include "base/basictypes.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/events/event_constants.h"
@@ skipping 146 matching lines @@
 #if defined(USE_ASH)
 // Below we map Chrome command ids to Ash action ids for commands that have
 // an shortcut that is handled by Ash (instead of Chrome). Adding entries
 // here will show shortcut text on menus. See comment above.
 struct ChromeCmdId2AshActionId {
   const int chrome_cmd_id;
   const ash::AcceleratorAction ash_action_id;
 };
 const ChromeCmdId2AshActionId kChromeCmdId2AshActionId[] = {
   { IDC_FEEDBACK,             ash::OPEN_FEEDBACK_PAGE },
-  { IDC_EXIT,                 ash::EXIT },
+  { IDC_EXIT,                 ash::EXIT_PRESSED },
   { IDC_NEW_INCOGNITO_WINDOW, ash::NEW_INCOGNITO_WINDOW },
   { IDC_NEW_TAB,              ash::NEW_TAB },
   { IDC_NEW_WINDOW,           ash::NEW_WINDOW },
 #if defined(OS_CHROMEOS)
   { IDC_OPEN_FILE,            ash::OPEN_FILE_DIALOG },
 #endif
   { IDC_RESTORE_TAB,          ash::RESTORE_TAB },
   { IDC_TASK_MANAGER,         ash::SHOW_TASK_MANAGER },
 };
 const size_t kChromeCmdId2AshActionIdLength =
@@ skipping 41 matching lines @@
       *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
       return true;
     case IDC_PASTE:
       *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
       return true;
   }
   return false;
 }
 
 }  // namespace chrome