diff options
Diffstat (limited to 'chrome/browser')
17 files changed, 71 insertions, 79 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index 533c81d..b351619 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc @@ -640,24 +640,24 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithUsLayouts) { // Henkan, Muhenkan, ZenkakuHankaku should be ignored when no Japanese IMEs // and keyboards are enabled. EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_CONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); // Do the same tests for Korean. EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_HANGUL, false, false, false))); + ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_SPACE, true, false, false))); + ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); } @@ -667,17 +667,17 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpLayout) { EXPECT_EQ(2U, manager_->GetNumActiveInputMethods()); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); manager_->SwitchToPreviousInputMethod(); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); manager_->SwitchToPreviousInputMethod(); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); } @@ -687,12 +687,12 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithKoLayout) { EXPECT_EQ(2U, manager_->GetNumActiveInputMethods()); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_HANGUL, false, false, false))); + ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE))); EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id()); manager_->SwitchToPreviousInputMethod(); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_SPACE, true, false, false))); + ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN))); EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id()); } @@ -704,22 +704,22 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) { EXPECT_TRUE(manager_->EnableInputMethods(ids)); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE))); EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_CONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE))); EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_CONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE))); EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); // Add Dvorak. @@ -727,10 +727,10 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) { EXPECT_TRUE(manager_->EnableInputMethods(ids)); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE))); EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false))); + ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE))); EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id()); } @@ -742,10 +742,10 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithKoIme) { EXPECT_TRUE(manager_->EnableInputMethods(ids)); EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_HANGUL, false, false, false))); + ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE))); EXPECT_EQ("mozc-hangul", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_HANGUL, false, false, false))); + ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE))); EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id()); // Add Dvorak. @@ -753,10 +753,10 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithKoIme) { EXPECT_TRUE(manager_->EnableInputMethods(ids)); EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_SPACE, true, false, false))); + ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN))); EXPECT_EQ("mozc-hangul", manager_->GetCurrentInputMethod().id()); EXPECT_TRUE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_SPACE, true, false, false))); + ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN))); EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id()); } @@ -770,7 +770,7 @@ TEST_F(InputMethodManagerImplTest, TestEnableDisableHotkeys) { EXPECT_FALSE(manager_->SwitchToPreviousInputMethod()); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); EXPECT_FALSE(manager_->SwitchInputMethod( - ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false))); + ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE))); EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id()); manager_->EnableHotkeys(); EXPECT_TRUE(manager_->SwitchToNextInputMethod()); diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index 113b72e..68eb562 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -135,16 +135,19 @@ WebUILoginView::WebUILoginView() // Make sure the singleton VirtualKeyboardManager object is created. VirtualKeyboardManager::GetInstance(); #endif - accel_map_[ui::Accelerator(ui::VKEY_Z, false, true, true)] = + accel_map_[ui::Accelerator(ui::VKEY_Z, + ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = kAccelNameAccessibility; - accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)] = + accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] = kAccelNameCancel; - accel_map_[ui::Accelerator(ui::VKEY_E, false, true, true)] = + accel_map_[ui::Accelerator(ui::VKEY_E, + ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = kAccelNameEnrollment; // This should be kept in sync with the IDC_EXIT accelerator. - accel_map_[ui::Accelerator(ui::VKEY_Q, true, true, false)] = + accel_map_[ui::Accelerator(ui::VKEY_Q, + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)] = kAccelNameExit; - accel_map_[ui::Accelerator(ui::VKEY_V, false, false, true)] = + accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = kAccelNameVersion; for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) diff --git a/chrome/browser/external_tab/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc index 7077637..ff4bb90 100644 --- a/chrome/browser/external_tab/external_tab_container_win.cc +++ b/chrome/browser/external_tab/external_tab_container_win.cc @@ -1107,12 +1107,9 @@ void ExternalTabContainer::LoadAccelerators() { // Let's fill our own accelerator table. for (int i = 0; i < count; ++i) { - bool alt_down = (accelerators[i].fVirt & FALT) == FALT; - bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; - bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(accelerators[i].key), - shift_down, ctrl_down, alt_down); + ui::GetModifiersFromACCEL(accelerators[i])); accelerator_table_[accelerator] = accelerators[i].cmd; // Also register with the focus manager. diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index feb061c..d79b6a4 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -835,7 +835,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) { views::FocusManager* focus_manager = widget->GetFocusManager(); // See where Escape is registered. - ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE); ui::AcceleratorTarget* old_target = focus_manager->GetCurrentTargetForAccelerator(escape); EXPECT_TRUE(old_target != NULL); diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc index e23d3ee..365cb26 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc @@ -474,8 +474,8 @@ gfx::Rect AvatarMenuBubbleView::GetAnchorRect() { void AvatarMenuBubbleView::Init() { // Build the menu for the first time. OnAvatarMenuModelChanged(avatar_menu_model_.get()); - AddAccelerator(ui::Accelerator(ui::VKEY_DOWN, 0)); - AddAccelerator(ui::Accelerator(ui::VKEY_UP, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_DOWN, ui::EF_NONE)); + AddAccelerator(ui::Accelerator(ui::VKEY_UP, ui::EF_NONE)); } void AvatarMenuBubbleView::OnAvatarMenuModelChanged( diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index e64aab6..5bb2c23 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -236,7 +236,7 @@ void BookmarkBubbleView::Init() { layout->AddView(edit_button_); layout->AddView(close_button_); - AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)); } BookmarkBubbleView::BookmarkBubbleView(views::View* anchor_view, diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc index 918f7e6..3a64c89 100644 --- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc +++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc @@ -305,7 +305,7 @@ void ChromeToMobileBubbleView::Init() { layout->AddView(send_); layout->AddView(cancel_); - AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)); } ChromeToMobileBubbleView::ChromeToMobileBubbleView(views::View* anchor_view, diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index f2fedab..f5f5a76 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -139,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { // Now send a VKEY_RETURN to the browser. This should result in closing // test_dialog1. EXPECT_TRUE(focus_manager->ProcessAccelerator( - ui::Accelerator(ui::VKEY_RETURN, false, false, false))); + ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE))); ui_test_utils::RunAllPendingInMessageLoop(); EXPECT_TRUE(test_dialog1->done()); @@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { // Send another VKEY_RETURN, closing test_dialog2 EXPECT_TRUE(focus_manager->ProcessAccelerator( - ui::Accelerator(ui::VKEY_RETURN, false, false, false))); + ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE))); ui_test_utils::RunAllPendingInMessageLoop(); EXPECT_TRUE(test_dialog2->done()); EXPECT_EQ(0u, constrained_window_helper->constrained_window_count()); diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index 1a2cb42..9961f3a3 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -334,7 +334,7 @@ void DropdownBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) { void DropdownBarHost::RegisterAccelerators() { DCHECK(!esc_accel_target_registered_); - ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE); focus_manager_->RegisterAccelerator( escape, ui::AcceleratorManager::kNormalPriority, this); esc_accel_target_registered_ = true; @@ -342,7 +342,7 @@ void DropdownBarHost::RegisterAccelerators() { void DropdownBarHost::UnregisterAccelerators() { DCHECK(esc_accel_target_registered_); - ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE); focus_manager_->UnregisterAccelerator(escape, this); esc_accel_target_registered_ = false; } diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 7eb4651..2f58c0a 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -312,14 +312,14 @@ void FindBarHost::RegisterAccelerators() { DropdownBarHost::RegisterAccelerators(); // Register for Ctrl+Return. - ui::Accelerator escape(ui::VKEY_RETURN, false, true, false); + ui::Accelerator escape(ui::VKEY_RETURN, ui::EF_CONTROL_DOWN); focus_manager()->RegisterAccelerator( escape, ui::AcceleratorManager::kNormalPriority, this); } void FindBarHost::UnregisterAccelerators() { // Unregister Ctrl+Return. - ui::Accelerator escape(ui::VKEY_RETURN, false, true, false); + ui::Accelerator escape(ui::VKEY_RETURN, ui::EF_CONTROL_DOWN); focus_manager()->UnregisterAccelerator(escape, this); DropdownBarHost::UnregisterAccelerators(); diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index f5fcbba..aa3a46f 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -68,6 +68,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" @@ -469,13 +470,13 @@ bool BrowserView::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) { // anywhere so we need to check for them explicitly here. switch (cmd_id) { case IDC_CUT: - *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN); return true; case IDC_COPY: - *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); return true; case IDC_PASTE: - *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); return true; } // Else, we retrieve the accelerator information from the accelerator table. @@ -1169,12 +1170,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(event.windowsKeyCode), - (event.modifiers & NativeWebKeyboardEvent::ShiftKey) == - NativeWebKeyboardEvent::ShiftKey, - (event.modifiers & NativeWebKeyboardEvent::ControlKey) == - NativeWebKeyboardEvent::ControlKey, - (event.modifiers & NativeWebKeyboardEvent::AltKey) == - NativeWebKeyboardEvent::AltKey); + content::GetModifiersFromNativeWebKeyboardEvent(event)); if (event.type == WebKit::WebInputEvent::KeyUp) accelerator.set_type(ui::ET_KEY_RELEASED); @@ -2148,12 +2144,9 @@ void BrowserView::LoadAccelerators() { // Let's fill our own accelerator table. for (int i = 0; i < count; ++i) { - bool alt_down = (accelerators[i].fVirt & FALT) == FALT; - bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; - bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(accelerators[i].key), - shift_down, ctrl_down, alt_down); + ui::GetModifiersFromACCEL(accelerators[i])); accelerator_table_[accelerator] = accelerators[i].cmd; // Also register with the focus manager. diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 75c2fe0..8d34e70 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -255,7 +255,7 @@ FullscreenExitBubbleViews::FullscreenExitBubbleViews( size_animation_->Reset(1); // Create the contents view. - ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); + ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE); bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator); DCHECK(got_accelerator); view_ = new FullscreenExitView( diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index e3e1c5e..d0428c4 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -29,7 +29,7 @@ JSModalDialogViews::JSModalDialogViews(JavaScriptAppModalDialog* parent) DCHECK(message_box_view_); message_box_view_->AddAccelerator( - ui::Accelerator(ui::VKEY_C, false, true, false)); + ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN)); if (parent->display_suppress_checkbox()) { message_box_view_->SetCheckBoxLabel( l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION)); diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc index 561a374..056178d 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc @@ -73,32 +73,34 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId( // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do. switch (command_id) { case IDC_CONTENT_CONTEXT_UNDO: - *accel = ui::Accelerator(ui::VKEY_Z, false, true, false); + *accel = ui::Accelerator(ui::VKEY_Z, ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_REDO: // TODO(jcampan): should it be Ctrl-Y? - *accel = ui::Accelerator(ui::VKEY_Z, true, true, false); + *accel = ui::Accelerator(ui::VKEY_Z, + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_CUT: - *accel = ui::Accelerator(ui::VKEY_X, false, true, false); + *accel = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_COPY: - *accel = ui::Accelerator(ui::VKEY_C, false, true, false); + *accel = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_PASTE: - *accel = ui::Accelerator(ui::VKEY_V, false, true, false); + *accel = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: - *accel = ui::Accelerator(ui::VKEY_V, true, true, false); + *accel = ui::Accelerator(ui::VKEY_V, + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); return true; case IDC_CONTENT_CONTEXT_SELECTALL: - *accel = ui::Accelerator(ui::VKEY_A, false, true, false); + *accel = ui::Accelerator(ui::VKEY_A, ui::EF_CONTROL_DOWN); return true; default: diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index bdc2fe0..3c62d2a 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -492,23 +492,24 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id, // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings. switch (command_id) { case IDC_CUT: - *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN); return true; case IDC_COPY: - *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); return true; case IDC_PASTE: - *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); return true; #if defined(USE_ASH) // When USE_ASH is defined, IDC_NEW_WINDOW and IDC_NEW_INCOGNITO_WINDOW are // handled outside Chrome, in ash/accelerators/accelerator_table.cc. // crbug.com/120196 case IDC_NEW_WINDOW: - *accelerator = ui::Accelerator(ui::VKEY_N, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_N, ui::EF_CONTROL_DOWN); return true; case IDC_NEW_INCOGNITO_WINDOW: - *accelerator = ui::Accelerator(ui::VKEY_N, true, true, false); + *accelerator = ui::Accelerator(ui::VKEY_N, + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN); return true; #endif } diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler_win.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler_win.cc index 8a6449e..726d68b 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler_win.cc +++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler_win.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "base/logging.h" +#include "content/public/browser/native_web_keyboard_event.h" #include "ui/views/focus/focus_manager.h" UnhandledKeyboardEventHandler::UnhandledKeyboardEventHandler() { @@ -32,12 +33,7 @@ void UnhandledKeyboardEventHandler::HandleKeyboardEvent( if (event.type == WebKit::WebInputEvent::RawKeyDown) { ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(event.windowsKeyCode), - (event.modifiers & NativeWebKeyboardEvent::ShiftKey) == - NativeWebKeyboardEvent::ShiftKey, - (event.modifiers & NativeWebKeyboardEvent::ControlKey) == - NativeWebKeyboardEvent::ControlKey, - (event.modifiers & NativeWebKeyboardEvent::AltKey) == - NativeWebKeyboardEvent::AltKey); + content::GetModifiersFromNativeWebKeyboardEvent(event)); // This is tricky: we want to set ignore_next_char_event_ if // ProcessAccelerator returns true. But ProcessAccelerator might delete diff --git a/chrome/browser/ui/views/web_dialog_view.cc b/chrome/browser/ui/views/web_dialog_view.cc index 9fcc614..3496471 100644 --- a/chrome/browser/ui/views/web_dialog_view.cc +++ b/chrome/browser/ui/views/web_dialog_view.cc @@ -61,7 +61,7 @@ WebDialogView::WebDialogView(Profile* profile, AddChildView(web_view_); SetLayoutManager(new views::FillLayout); // Pressing the ESC key will close the dialog. - AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)); } WebDialogView::~WebDialogView() { |