Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Unified Diff: trunk/src/chrome/browser/ui/views/accelerator_utils_aura.cc

Issue 14096026: Revert 194594 "Make sure manifest specified shortcut for Extensi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/views/accelerator_utils_aura.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/accelerator_utils_aura.cc (revision 194596)
+++ trunk/src/chrome/browser/ui/views/accelerator_utils_aura.cc (working copy)
@@ -1,38 +0,0 @@
-// Copyright (c) 2013 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/profiles/profile.h"
-#include "chrome/browser/ui/views/accelerator_table.h"
-#include "ui/base/accelerators/accelerator.h"
-
-#if defined(USE_ASH)
-#include "ash/accelerators/accelerator_table.h"
-#endif // USE_ASH
-
-namespace chrome {
-
-bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) {
-#if defined(USE_ASH)
- for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) {
- const ash::AcceleratorData& accel_data = ash::kAcceleratorData[i];
- if (accel_data.keycode == accelerator.key_code() &&
- accel_data.modifiers == accelerator.modifiers()) {
- return true;
- }
- }
-#endif
-
- std::vector<chrome::AcceleratorMapping> accelerators =
- chrome::GetAcceleratorList();
- for (std::vector<chrome::AcceleratorMapping>::const_iterator it =
- accelerators.begin(); it != accelerators.end(); ++it) {
- if (it->keycode == accelerator.key_code() &&
- it->modifiers == accelerator.modifiers())
- return true;
- }
-
- return false;
-}
-
-} // namespace chrome
« no previous file with comments | « trunk/src/chrome/browser/ui/gtk/accelerator_utils_gtk.cc ('k') | trunk/src/chrome/browser/ui/views/accelerator_utils_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698