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

Unified Diff: views/controls/tree/tree_view.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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
« no previous file with comments | « views/controls/textfield/native_textfield_win.cc ('k') | views/focus/accelerator_handler_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/tree/tree_view.cc
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 80313ed64840b54b2e603770a3a56c9b763ae527..c0a4c6577c70842a353c1853ef45b0a42658f216 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -15,6 +15,7 @@
#include "ui/base/keycodes/keyboard_code_conversion_win.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/models/accelerator.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/win/hwnd_util.h"
#include "ui/gfx/canvas_skia.h"
@@ -474,10 +475,10 @@ bool TreeView::OnKeyDown(ui::KeyboardCode virtual_key_code) {
} else if (virtual_key_code == ui::VKEY_RETURN && !process_enter_) {
Widget* widget = GetWidget();
DCHECK(widget);
- Accelerator accelerator(Accelerator(virtual_key_code,
- base::win::IsShiftPressed(),
- base::win::IsCtrlPressed(),
- base::win::IsAltPressed()));
+ ui::Accelerator accelerator(ui::Accelerator(virtual_key_code,
+ base::win::IsShiftPressed(),
+ base::win::IsCtrlPressed(),
+ base::win::IsAltPressed()));
GetFocusManager()->ProcessAccelerator(accelerator);
return true;
}
« no previous file with comments | « views/controls/textfield/native_textfield_win.cc ('k') | views/focus/accelerator_handler_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698