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

Unified Diff: views/controls/tabbed_pane/tabbed_pane.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/tabbed_pane/tabbed_pane.h ('k') | views/controls/textfield/native_textfield_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/tabbed_pane/tabbed_pane.cc
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index d17a3f73aff722485d8dda2324ce81f78e639476..72ff0edcae1da06bc7d5df4c2e55a9990f614635 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -71,9 +71,9 @@ gfx::Size TabbedPane::GetPreferredSize() {
void TabbedPane::LoadAccelerators() {
// Ctrl+Shift+Tab
- AddAccelerator(views::Accelerator(ui::VKEY_TAB, true, true, false));
+ AddAccelerator(ui::Accelerator(ui::VKEY_TAB, true, true, false));
// Ctrl+Tab
- AddAccelerator(views::Accelerator(ui::VKEY_TAB, false, true, false));
+ AddAccelerator(ui::Accelerator(ui::VKEY_TAB, false, true, false));
}
void TabbedPane::Layout() {
@@ -91,7 +91,7 @@ void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
}
}
-bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) {
+bool TabbedPane::AcceleratorPressed(const ui::Accelerator& accelerator) {
// We only accept Ctrl+Tab keyboard events.
DCHECK(accelerator.key_code() == ui::VKEY_TAB && accelerator.IsCtrlDown());
« no previous file with comments | « views/controls/tabbed_pane/tabbed_pane.h ('k') | views/controls/textfield/native_textfield_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698