diff options
91 files changed, 344 insertions, 349 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index 27fa015..489fa04 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -71,7 +71,7 @@ class SimpleMenuModelDelegateAdapter : public views::MenuDelegate { // views::MenuDelegate implementation. virtual bool GetAccelerator(int id, - views::Accelerator* accelerator) OVERRIDE; + ui::Accelerator* accelerator) OVERRIDE; virtual string16 GetLabel(int id) const OVERRIDE; virtual bool IsCommandEnabled(int id) const OVERRIDE; virtual bool IsItemChecked(int id) const OVERRIDE; @@ -93,7 +93,7 @@ SimpleMenuModelDelegateAdapter::SimpleMenuModelDelegateAdapter( bool SimpleMenuModelDelegateAdapter::GetAccelerator( int id, - views::Accelerator* accelerator) { + ui::Accelerator* accelerator) { return simple_menu_model_delegate_->GetAcceleratorForCommandId( id, accelerator); } diff --git a/chrome/browser/chromeos/login/screen_locker.h b/chrome/browser/chromeos/login/screen_locker.h index de79abe..2397b8c 100644 --- a/chrome/browser/chromeos/login/screen_locker.h +++ b/chrome/browser/chromeos/login/screen_locker.h @@ -13,7 +13,7 @@ #include "base/time.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/chromeos/login/screen_locker_delegate.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" namespace gfx { class Rect; diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc index ed5657d..dd4d4fa 100644 --- a/chrome/browser/chromeos/login/screen_locker_views.cc +++ b/chrome/browser/chromeos/login/screen_locker_views.cc @@ -747,7 +747,7 @@ void ScreenLockerViews::ScreenLockReady() { if (background_view_->ScreenSaverEnabled()) { lock_widget_->GetFocusManager()->RegisterAccelerator( - views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); + ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); locker_input_event_observer_.reset(new LockerInputEventObserver(this)); MessageLoopForUI::current()->AddObserver( locker_input_event_observer_.get()); @@ -861,7 +861,7 @@ ScreenLockerViews::~ScreenLockerViews() { MessageLoopForUI::current()->RemoveObserver(input_event_observer_.get()); if (locker_input_event_observer_.get()) { lock_widget_->GetFocusManager()->UnregisterAccelerator( - views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); + ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); MessageLoopForUI::current()->RemoveObserver( locker_input_event_observer_.get()); } @@ -913,7 +913,7 @@ void ScreenLockerViews::ShowErrorBubble( } bool ScreenLockerViews::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { if (!background_view_->IsScreenSaverVisible()) { screen_locker_view_->StartScreenSaver(); return true; diff --git a/chrome/browser/chromeos/login/screen_locker_views.h b/chrome/browser/chromeos/login/screen_locker_views.h index db95a5c..aa6eef8 100644 --- a/chrome/browser/chromeos/login/screen_locker_views.h +++ b/chrome/browser/chromeos/login/screen_locker_views.h @@ -30,7 +30,7 @@ class ScreenLockerTester; class ScreenLockerViews : public ScreenLockerDelegate, public MessageBubbleDelegate, public CaptchaView::Delegate, - public views::AcceleratorTarget { + public ui::AcceleratorTarget { public: // Interface that helps switching from ScreenLockView to CaptchaView. class ScreenLockViewContainer { @@ -90,9 +90,8 @@ class ScreenLockerViews : public ScreenLockerDelegate, void ShowErrorBubble(const string16& message, views::BubbleBorder::ArrowLocation arrow_location); - // Overridden from AcceleratorTarget: - virtual bool AcceleratorPressed(const views::Accelerator& accelerator) - OVERRIDE; + // Overridden from ui::AcceleratorTarget: + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Event handler for client-event. CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*); diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index 2562826..589f8be 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -118,11 +118,11 @@ WebUILoginView::WebUILoginView() // Make sure the singleton VirtualKeyboardManager object is created. VirtualKeyboardManager::GetInstance(); #endif - accel_map_[views::Accelerator(ui::VKEY_Z, false, true, true)] = + accel_map_[ui::Accelerator(ui::VKEY_Z, false, true, true)] = kAccelNameAccessibility; - accel_map_[views::Accelerator(ui::VKEY_ESCAPE, false, false, false)] = + accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)] = kAccelNameCancel; - accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] = + accel_map_[ui::Accelerator(ui::VKEY_E, false, true, true)] = kAccelNameEnrollment; for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) @@ -153,7 +153,7 @@ std::string WebUILoginView::GetClassName() const { } bool WebUILoginView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { AccelMap::const_iterator entry = accel_map_.find(accelerator); if (entry == accel_map_.end()) return false; diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h index a5f5ce5..7826c42 100644 --- a/chrome/browser/chromeos/login/webui_login_view.h +++ b/chrome/browser/chromeos/login/webui_login_view.h @@ -46,7 +46,7 @@ class WebUILoginView : public views::WidgetDelegateView, // Overridden from views::Views: virtual bool AcceleratorPressed( - const views::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) OVERRIDE; virtual std::string GetClassName() const OVERRIDE; // Called when WebUI window is created. @@ -104,7 +104,7 @@ class WebUILoginView : public views::WidgetDelegateView, private: // Map type for the accelerator-to-identifier map. - typedef std::map<views::Accelerator, std::string> AccelMap; + typedef std::map<ui::Accelerator, std::string> AccelMap; // Overridden from TabContentsDelegate. virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE; diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index 833052c..d00ecf4 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -18,18 +18,18 @@ #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #include "views/view.h" namespace chromeos { -scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_; +scoped_ptr<ui::Accelerator> WizardAccessibilityHelper::accelerator_; // static -views::Accelerator WizardAccessibilityHelper::GetAccelerator() { +ui::Accelerator WizardAccessibilityHelper::GetAccelerator() { if (!WizardAccessibilityHelper::accelerator_.get()) WizardAccessibilityHelper::accelerator_.reset( - new views::Accelerator(ui::VKEY_Z, false, true, true)); + new ui::Accelerator(ui::VKEY_Z, false, true, true)); return *(WizardAccessibilityHelper::accelerator_.get()); } diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h index 5cd0cfd..f89854c 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h @@ -11,10 +11,10 @@ #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/models/accelerator.h" class Profile; namespace views { -class Accelerator; class View; } @@ -28,7 +28,7 @@ class WizardAccessibilityHelper { static WizardAccessibilityHelper* GetInstance(); // Get accelerator for enabling accessibility. - static views::Accelerator GetAccelerator(); + static ui::Accelerator GetAccelerator(); // Speak the given text if the accessibility pref is already set. |queue| // specifies whether this utterance will be queued or spoken immediately. @@ -59,7 +59,7 @@ class WizardAccessibilityHelper { void SetAccessibilityEnabled(bool); - static scoped_ptr<views::Accelerator> accelerator_; + static scoped_ptr<ui::Accelerator> accelerator_; scoped_ptr<WizardAccessibilityHandler> accessibility_handler_; diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 40730dd..86fed61 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -42,7 +42,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_types.h" #include "ui/base/l10n/l10n_util.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #if defined(USE_LINUX_BREAKPAD) #include "chrome/app/breakpad_linux.h" diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 3748481..a266c59 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -21,8 +21,8 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/models/accelerator.h" #include "unicode/locid.h" -#include "views/accelerator.h" namespace chromeos { diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 2358b01..f324298 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -1036,8 +1036,8 @@ bool ExternalTabContainer::DrawInfoBarArrows(int* x) const { } bool ExternalTabContainer::AcceleratorPressed( - const views::Accelerator& accelerator) { - std::map<views::Accelerator, int>::const_iterator iter = + const ui::Accelerator& accelerator) { + std::map<ui::Accelerator, int>::const_iterator iter = accelerator_table_.find(accelerator); DCHECK(iter != accelerator_table_.end()); @@ -1127,7 +1127,7 @@ void ExternalTabContainer::LoadAccelerators() { bool alt_down = (accelerators[i].fVirt & FALT) == FALT; bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; - views::Accelerator accelerator( + ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(accelerators[i].key), shift_down, ctrl_down, alt_down); accelerator_table_[accelerator] = accelerators[i].cmd; diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index df64dc4..190f598 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -24,7 +24,7 @@ #include "content/public/browser/navigation_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #include "views/widget/native_widget_win.h" class AutomationProvider; @@ -48,7 +48,7 @@ class ExternalTabContainer : public TabContentsDelegate, public content::NotificationObserver, public views::NativeWidgetWin, public base::RefCounted<ExternalTabContainer>, - public views::AcceleratorTarget, + public ui::AcceleratorTarget, public InfoBarContainer::Delegate, public BrowserBubbleHost, public BlockedContentTabHelperDelegate { @@ -209,7 +209,7 @@ class ExternalTabContainer : public TabContentsDelegate, static scoped_refptr<ExternalTabContainer> RemovePendingTab(uintptr_t cookie); // Handles the specified |accelerator| being pressed. - bool AcceleratorPressed(const views::Accelerator& accelerator); + bool AcceleratorPressed(const ui::Accelerator& accelerator); bool pending() const { return pending_; @@ -311,7 +311,7 @@ class ExternalTabContainer : public TabContentsDelegate, UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; // A mapping between accelerators and commands. - std::map<views::Accelerator, int> accelerator_table_; + std::map<ui::Accelerator, int> accelerator_table_; // Top level navigations received for a tab while it is waiting for an ack // from the external host go here. Scenario is a window.open executes on a 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 3341305..a849184 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -25,6 +25,7 @@ #include "content/public/browser/notification_types.h" #include "net/test/test_server.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/models/accelerator.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/find_bar_host.h" @@ -763,15 +764,15 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) { views::FocusManager* focus_manager = widget->GetFocusManager(); // See where Escape is registered. - views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); - views::AcceleratorTarget* old_target = + ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); + ui::AcceleratorTarget* old_target = focus_manager->GetCurrentTargetForAccelerator(escape); EXPECT_TRUE(old_target != NULL); browser()->ShowFindBar(); // Our Find bar should be the new target. - views::AcceleratorTarget* new_target = + ui::AcceleratorTarget* new_target = focus_manager->GetCurrentTargetForAccelerator(escape); EXPECT_TRUE(new_target != NULL); diff --git a/chrome/browser/ui/panels/panel_browser_view.cc b/chrome/browser/ui/panels/panel_browser_view.cc index fe84d77..b746c7e 100644 --- a/chrome/browser/ui/panels/panel_browser_view.cc +++ b/chrome/browser/ui/panels/panel_browser_view.cc @@ -179,7 +179,7 @@ void PanelBrowserView::OnWidgetActivationChanged(views::Widget* widget, } bool PanelBrowserView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { if (mouse_pressed_ && accelerator.key_code() == ui::VKEY_ESCAPE) { OnTitlebarMouseCaptureLost(); return true; diff --git a/chrome/browser/ui/panels/panel_browser_view.h b/chrome/browser/ui/panels/panel_browser_view.h index 45a8991..80f5223 100644 --- a/chrome/browser/ui/panels/panel_browser_view.h +++ b/chrome/browser/ui/panels/panel_browser_view.h @@ -63,8 +63,7 @@ class PanelBrowserView : public BrowserView, virtual bool GetSavedWindowPlacement( gfx::Rect* bounds, ui::WindowShowState* show_state) const OVERRIDE; - virtual bool AcceleratorPressed(const views::Accelerator& accelerator) - OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Overridden from views::WidgetDelegate: virtual void OnDisplayChanged() OVERRIDE; diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc index 9a28116..4ce0104 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc @@ -387,7 +387,7 @@ void AvatarMenuBubbleView::Layout() { } bool AvatarMenuBubbleView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { if (accelerator.key_code() != ui::VKEY_DOWN && accelerator.key_code() != ui::VKEY_UP) { return false; @@ -446,9 +446,9 @@ void AvatarMenuBubbleView::LinkClicked(views::Link* source, int event_flags) { void AvatarMenuBubbleView::BubbleShown() { GetFocusManager()->RegisterAccelerator( - views::Accelerator(ui::VKEY_DOWN, false, false, false), this); + ui::Accelerator(ui::VKEY_DOWN, false, false, false), this); GetFocusManager()->RegisterAccelerator( - views::Accelerator(ui::VKEY_UP, false, false, false), this); + ui::Accelerator(ui::VKEY_UP, false, false, false), this); } void AvatarMenuBubbleView::BubbleClosing(Bubble* bubble, diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.h b/chrome/browser/ui/views/avatar_menu_bubble_view.h index 90d8c85..c606a3a 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.h +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.h @@ -38,8 +38,7 @@ class AvatarMenuBubbleView : public views::View, // views::View implementation. virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void Layout() OVERRIDE; - virtual bool AcceleratorPressed( - const views::Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index dead673..dbf0d14 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -136,7 +136,7 @@ void BookmarkBubbleView::WindowClosing() { } bool BookmarkBubbleView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { if (accelerator.key_code() == ui::VKEY_RETURN) { if (edit_button_->HasFocus()) HandleButtonPressed(edit_button_); @@ -235,7 +235,7 @@ void BookmarkBubbleView::Init() { layout->AddView(edit_button_); layout->AddView(close_button_); - AddAccelerator(views::Accelerator(ui::VKEY_RETURN, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, 0)); } BookmarkBubbleView::BookmarkBubbleView(views::View* anchor_view, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index c134802..a699e79 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -49,8 +49,7 @@ class BookmarkBubbleView : public views::BubbleDelegateView, virtual void WindowClosing() OVERRIDE; // views::View method. - virtual bool AcceleratorPressed( - const views::Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; protected: // views::BubbleDelegateView method. diff --git a/chrome/browser/ui/views/bubble/bubble.cc b/chrome/browser/ui/views/bubble/bubble.cc index f16c03f..4312853 100644 --- a/chrome/browser/ui/views/bubble/bubble.cc +++ b/chrome/browser/ui/views/bubble/bubble.cc @@ -324,14 +324,14 @@ void Bubble::InitBubble(views::Widget* parent, void Bubble::RegisterEscapeAccelerator() { GetWidget()->GetFocusManager()->RegisterAccelerator( - views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); + ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); accelerator_registered_ = true; } void Bubble::UnregisterEscapeAccelerator() { DCHECK(accelerator_registered_); GetWidget()->GetFocusManager()->UnregisterAccelerator( - views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); + ui::Accelerator(ui::VKEY_ESCAPE, false, false, false), this); accelerator_registered_ = false; } @@ -443,7 +443,7 @@ void Bubble::Fade(bool fade_in) { animation_->Hide(); } -bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) { +bool Bubble::AcceleratorPressed(const ui::Accelerator& accelerator) { if (!delegate_ || delegate_->CloseOnEscape()) { DoClose(true); return true; diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index b6093d1..68ce928 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -9,7 +9,7 @@ #include "base/observer_list.h" #include "views/bubble/bubble_border.h" #include "ui/base/animation/animation_delegate.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #include "views/view.h" #if defined(USE_AURA) @@ -87,7 +87,7 @@ class Bubble #elif defined(TOOLKIT_USES_GTK) : public views::NativeWidgetGtk, #endif - public views::AcceleratorTarget, + public ui::AcceleratorTarget, public ui::AnimationDelegate { public: class Observer { @@ -236,7 +236,7 @@ class Bubble void UnregisterEscapeAccelerator(); // Overridden from AcceleratorTarget: - virtual bool AcceleratorPressed(const views::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); // The delegate, if any. BubbleDelegate* delegate_; diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 6e38db68..b8941a0 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #include "views/controls/textfield/textfield.h" #include "views/focus/focus_manager.h" #include "views/layout/fill_layout.h" @@ -120,9 +120,9 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { ASSERT_TRUE(focus_manager); // old_target should be the OK button for test_dialog1. - views::AcceleratorTarget* old_target = + ui::AcceleratorTarget* old_target = focus_manager->GetCurrentTargetForAccelerator( - views::Accelerator(ui::VKEY_RETURN, false, false, false)); + ui::Accelerator(ui::VKEY_RETURN, false, false, false)); ASSERT_TRUE(old_target != NULL); // test_dialog1's text field should be focused. EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(), @@ -139,9 +139,9 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { // new_target should be the same as old_target since test_dialog2 is still // hidden. - views::AcceleratorTarget* new_target = + ui::AcceleratorTarget* new_target = focus_manager->GetCurrentTargetForAccelerator( - views::Accelerator(ui::VKEY_RETURN, false, false, false)); + ui::Accelerator(ui::VKEY_RETURN, false, false, false)); ASSERT_TRUE(new_target != NULL); EXPECT_EQ(old_target, new_target); @@ -153,7 +153,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( - views::Accelerator(ui::VKEY_RETURN, false, false, false))); + ui::Accelerator(ui::VKEY_RETURN, false, false, false))); ui_test_utils::RunAllPendingInMessageLoop(); EXPECT_TRUE(test_dialog1->done()); @@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { // Send another VKEY_RETURN, closing test_dialog2 EXPECT_TRUE(focus_manager->ProcessAccelerator( - views::Accelerator(ui::VKEY_RETURN, false, false, false))); + ui::Accelerator(ui::VKEY_RETURN, false, false, false))); 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/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index ca95103..f95ad63 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -17,6 +17,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" @@ -121,7 +122,7 @@ void CriticalNotificationBubbleView::WindowClosing() { } bool CriticalNotificationBubbleView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { if (accelerator.key_code() == ui::VKEY_ESCAPE) UpgradeDetector::GetInstance()->acknowledge_critical_update(); return BubbleDelegateView::AcceleratorPressed(accelerator); diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h index 0e886a8..7ba4300 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.h +++ b/chrome/browser/ui/views/critical_notification_bubble_view.h @@ -10,6 +10,10 @@ #include "views/controls/button/button.h" #include "views/bubble/bubble_delegate.h" +namespace ui { +class Accelerator; +} + namespace views { class Label; class NativeTextButton; @@ -31,7 +35,7 @@ class CriticalNotificationBubbleView : public views::BubbleDelegateView, protected: // views::BubbleDelegateView overrides: virtual bool AcceleratorPressed( - const views::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) OVERRIDE; virtual void Init() OVERRIDE; private: diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index b1cc7aa..bf544ba 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -335,14 +335,14 @@ void DropdownBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) { void DropdownBarHost::RegisterAccelerators() { DCHECK(!esc_accel_target_registered_); - views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); focus_manager_->RegisterAccelerator(escape, this); esc_accel_target_registered_ = true; } void DropdownBarHost::UnregisterAccelerators() { DCHECK(esc_accel_target_registered_); - views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape(ui::VKEY_ESCAPE, false, false, false); focus_manager_->UnregisterAccelerator(escape, this); esc_accel_target_registered_ = false; } diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h index 4c5b5af..0140f8b 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.h +++ b/chrome/browser/ui/views/dropdown_bar_host.h @@ -39,7 +39,7 @@ class Widget; // obscuring the selection results in FindBar. // //////////////////////////////////////////////////////////////////////////////// -class DropdownBarHost : public views::AcceleratorTarget, +class DropdownBarHost : public ui::AcceleratorTarget, public views::FocusChangeListener, public ui::AnimationDelegate { public: @@ -76,8 +76,8 @@ class DropdownBarHost : public views::AcceleratorTarget, virtual void OnDidChangeFocus(views::View* focused_before, views::View* focused_now) OVERRIDE; - // Overridden from views::AcceleratorTarget: - virtual bool AcceleratorPressed(const views::Accelerator& accelerator) = 0; + // Overridden from ui::AcceleratorTarget: + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) = 0; // ui::AnimationDelegate implementation: virtual void AnimationProgressed(const ui::Animation* animation); diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index f2c822f..cb3025cbf 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -168,9 +168,9 @@ FindBarTesting* FindBarHost::GetFindBarTesting() { } //////////////////////////////////////////////////////////////////////////////// -// FindBarWin, views::AcceleratorTarget implementation: +// FindBarWin, ui::AcceleratorTarget implementation: -bool FindBarHost::AcceleratorPressed(const views::Accelerator& accelerator) { +bool FindBarHost::AcceleratorPressed(const ui::Accelerator& accelerator) { ui::KeyboardCode key = accelerator.key_code(); if (key == ui::VKEY_RETURN && accelerator.IsCtrlDown()) { // Ctrl+Enter closes the Find session and navigates any link that is active. @@ -302,13 +302,13 @@ void FindBarHost::RegisterAccelerators() { DropdownBarHost::RegisterAccelerators(); // Register for Ctrl+Return. - views::Accelerator escape(ui::VKEY_RETURN, false, true, false); + ui::Accelerator escape(ui::VKEY_RETURN, false, true, false); focus_manager()->RegisterAccelerator(escape, this); } void FindBarHost::UnregisterAccelerators() { // Unregister Ctrl+Return. - views::Accelerator escape(ui::VKEY_RETURN, false, true, false); + ui::Accelerator escape(ui::VKEY_RETURN, false, true, false); focus_manager()->UnregisterAccelerator(escape, this); DropdownBarHost::UnregisterAccelerators(); diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h index beacf51..ee593d7 100644 --- a/chrome/browser/ui/views/find_bar_host.h +++ b/chrome/browser/ui/views/find_bar_host.h @@ -64,8 +64,8 @@ class FindBarHost : public DropdownBarHost, virtual void RestoreSavedFocus(); virtual FindBarTesting* GetFindBarTesting(); - // Overridden from views::AcceleratorTarget in DropdownBarHost class: - virtual bool AcceleratorPressed(const views::Accelerator& accelerator); + // Overridden from ui::AcceleratorTarget in DropdownBarHost class: + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); // FindBarTesting implementation: virtual bool GetFindBarWindowInfo(gfx::Point* position, diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 4fc3b93..2f726689 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -93,6 +93,7 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "views/controls/single_split_view.h" @@ -457,7 +458,7 @@ bool BrowserView::ShouldShowAvatar() const { return AvatarMenuModel::ShouldShowAvatarMenu(); } -bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) { +bool BrowserView::AcceleratorPressed(const ui::Accelerator& accelerator) { #if defined(OS_CHROMEOS) // If accessibility is enabled, stop speech and return false so that key // combinations involving Search can be used for extra accessibility @@ -470,7 +471,7 @@ bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) { } #endif - std::map<views::Accelerator, int>::const_iterator iter = + std::map<ui::Accelerator, int>::const_iterator iter = accelerator_table_.find(accelerator); DCHECK(iter != accelerator_table_.end()); int command_id = iter->second; @@ -485,18 +486,17 @@ 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 = views::Accelerator(ui::VKEY_X, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false); return true; case IDC_COPY: - *accelerator = views::Accelerator(ui::VKEY_C, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false); return true; case IDC_PASTE: - *accelerator = views::Accelerator(ui::VKEY_V, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false); return true; } // Else, we retrieve the accelerator information from the accelerator table. - std::map<views::Accelerator, int>::iterator it = - accelerator_table_.begin(); + std::map<ui::Accelerator, int>::iterator it = accelerator_table_.begin(); for (; it != accelerator_table_.end(); ++it) { if (it->second == cmd_id) { *accelerator = it->first; @@ -1176,12 +1176,12 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, // it'll be best if we can unify these conversion tables. // See http://crbug.com/54315 views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event)); - views::Accelerator accelerator(views_event.key_code(), - views_event.IsShiftDown(), - views_event.IsControlDown(), - views_event.IsAltDown()); + ui::Accelerator accelerator(views_event.key_code(), + views_event.IsShiftDown(), + views_event.IsControlDown(), + views_event.IsAltDown()); #else - views::Accelerator accelerator( + ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(event.windowsKeyCode), (event.modifiers & NativeWebKeyboardEvent::ShiftKey) == NativeWebKeyboardEvent::ShiftKey, @@ -2300,7 +2300,7 @@ void BrowserView::LoadAccelerators() { bool alt_down = (accelerators[i].fVirt & FALT) == FALT; bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; - views::Accelerator accelerator( + ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(accelerators[i].key), shift_down, ctrl_down, alt_down); accelerator_table_[accelerator] = accelerators[i].cmd; @@ -2316,10 +2316,10 @@ void BrowserView::LoadAccelerators() { DCHECK(focus_manager); // Let's fill our own accelerator table. for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { - views::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, - browser::kAcceleratorMap[i].shift_pressed, - browser::kAcceleratorMap[i].ctrl_pressed, - browser::kAcceleratorMap[i].alt_pressed); + ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, + browser::kAcceleratorMap[i].shift_pressed, + browser::kAcceleratorMap[i].ctrl_pressed, + browser::kAcceleratorMap[i].alt_pressed); accelerator_table_[accelerator] = browser::kAcceleratorMap[i].command_id; // Also register with the focus manager. @@ -2449,7 +2449,7 @@ void BrowserView::InitHangMonitor() { } void BrowserView::UpdateAcceleratorMetrics( - const views::Accelerator& accelerator, int command_id) { + const ui::Accelerator& accelerator, int command_id) { const ui::KeyboardCode key_code = accelerator.key_code(); if (command_id == IDC_HELP_PAGE && key_code == ui::VKEY_F1) UserMetrics::RecordAction(UserMetricsAction("ShowHelpTabViaF1")); diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index a3a5415..3cacd23 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -66,6 +66,10 @@ class JumpList; class LauncherIconUpdater; #endif +namespace ui { +class Accelerator; +} + namespace views { class AccessiblePaneView; class ExternalFocusTracker; @@ -162,7 +166,7 @@ class BrowserView : public BrowserBubbleHost, virtual bool ShouldShowAvatar() const; // Handle the specified |accelerator| being pressed. - virtual bool AcceleratorPressed(const views::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); // Provides the containing frame with the accelerator for the specified // command id. This can be used to provide menu item shortcut hints etc. @@ -548,7 +552,7 @@ class BrowserView : public BrowserBubbleHost, // Possibly records a user metrics action corresponding to the passed-in // accelerator. Only implemented for Chrome OS, where we're interested in // learning about how frequently the top-row keys are used. - void UpdateAcceleratorMetrics(const views::Accelerator& accelerator, + void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator, int command_id); // Invoked from ActiveTabChanged or when instant is made active. @@ -666,7 +670,7 @@ class BrowserView : public BrowserBubbleHost, scoped_ptr<StatusBubbleViews> status_bubble_; // A mapping between accelerators and commands. - std::map<views::Accelerator, int> accelerator_table_; + std::map<ui::Accelerator, int> accelerator_table_; // True if we have already been initialized. bool initialized_; diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index ba7358c..28ea7a9 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -230,7 +230,7 @@ FullscreenExitBubbleViews::FullscreenExitBubbleViews( size_animation_->Reset(1); // Create the contents view. - views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); + ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator); DCHECK(got_accelerator); view_ = new FullscreenExitView( diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index a9ce20f..d93100e 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -69,7 +69,7 @@ gfx::Size HtmlDialogView::GetPreferredSize() { return out; } -bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) { +bool HtmlDialogView::AcceleratorPressed(const ui::Accelerator& accelerator) { // Pressing ESC closes the dialog. DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code()); OnDialogClosed(std::string()); @@ -257,7 +257,7 @@ void HtmlDialogView::InitDialog() { void HtmlDialogView::RegisterDialogAccelerators() { // Pressing the ESC key will close the dialog. - AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)); } void HtmlDialogView::OnRenderHostCreated(RenderViewHost* host) { diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h index 5877c72..34742a8 100644 --- a/chrome/browser/ui/views/html_dialog_view.h +++ b/chrome/browser/ui/views/html_dialog_view.h @@ -48,7 +48,7 @@ class HtmlDialogView // Overridden from views::View: virtual gfx::Size GetPreferredSize() OVERRIDE; - virtual bool AcceleratorPressed(const views::Accelerator& accelerator) + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child) OVERRIDE; diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index 683b845..114a756 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -28,7 +28,7 @@ JSModalDialogViews::JSModalDialogViews( DCHECK(message_box_view_); message_box_view_->AddAccelerator( - views::Accelerator(ui::VKEY_C, false, true, false)); + ui::Accelerator(ui::VKEY_C, false, true, false)); if (parent->display_suppress_checkbox()) { message_box_view_->SetCheckBoxLabel( l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION)); diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc index fd08f13d..9d45ae0 100644 --- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc +++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc @@ -47,21 +47,21 @@ KeyboardOverlayDialogView::~KeyboardOverlayDialogView() { void KeyboardOverlayDialogView::RegisterDialogAccelerators() { for (size_t i = 0; i < arraysize(kCloseAccelerators); ++i) { - views::Accelerator accelerator(kCloseAccelerators[i].keycode, - kCloseAccelerators[i].shift_pressed, - kCloseAccelerators[i].ctrl_pressed, - kCloseAccelerators[i].alt_pressed); + ui::Accelerator accelerator(kCloseAccelerators[i].keycode, + kCloseAccelerators[i].shift_pressed, + kCloseAccelerators[i].ctrl_pressed, + kCloseAccelerators[i].alt_pressed); close_accelerators_.insert(accelerator); AddAccelerator(accelerator); } for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { - views::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, - browser::kAcceleratorMap[i].shift_pressed, - browser::kAcceleratorMap[i].ctrl_pressed, - browser::kAcceleratorMap[i].alt_pressed); + ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, + browser::kAcceleratorMap[i].shift_pressed, + browser::kAcceleratorMap[i].ctrl_pressed, + browser::kAcceleratorMap[i].alt_pressed); // Skip a sole ALT key since it's handled on the keyboard overlay. - if (views::Accelerator(ui::VKEY_MENU, false, false, false) == accelerator) { + if (ui::Accelerator(ui::VKEY_MENU, false, false, false) == accelerator) { continue; } // Skip accelerators for closing the dialog since they are already added. @@ -73,7 +73,7 @@ void KeyboardOverlayDialogView::RegisterDialogAccelerators() { } bool KeyboardOverlayDialogView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { if (!IsCloseAccelerator(accelerator)) { parent_view_->AcceleratorPressed(accelerator); } @@ -101,6 +101,6 @@ void KeyboardOverlayDialogView::ShowDialog( } bool KeyboardOverlayDialogView::IsCloseAccelerator( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { return close_accelerators_.find(accelerator) != close_accelerators_.end(); } diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h index ff0d95f..632c708 100644 --- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h +++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h @@ -12,6 +12,10 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/browser/ui/views/html_dialog_view.h" +namespace ui { +class Accelerator; +} + class BrowserView; // A customized dialog view for the keyboard overlay. @@ -23,7 +27,7 @@ class KeyboardOverlayDialogView : public HtmlDialogView { virtual ~KeyboardOverlayDialogView(); // Overridden from views::View: - virtual bool AcceleratorPressed(const views::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); // Shows the keyboard overlay. static void ShowDialog(gfx::NativeWindow owning_window, BrowserView* parent); @@ -32,13 +36,13 @@ class KeyboardOverlayDialogView : public HtmlDialogView { virtual void RegisterDialogAccelerators() OVERRIDE; // Returns true if |accelerator| is an accelerator for closing the dialog. - bool IsCloseAccelerator(const views::Accelerator& accelerator); + bool IsCloseAccelerator(const ui::Accelerator& accelerator); // Points to the view from which this dialog is created. BrowserView* parent_view_; // Contains accelerators for closing this dialog. - std::set<views::Accelerator> close_accelerators_; + std::set<ui::Accelerator> close_accelerators_; DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayDialogView); }; diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index 614563f..038c127 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -49,8 +49,10 @@ class TabContents; class TabContentsWrapper; class TemplateURLService; -namespace views { +namespace ui { class Accelerator; +} // namespace ui +namespace views { class HorizontalPainter; class Label; } // namespace views 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 d9d6339..125e1c4 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 @@ -13,7 +13,7 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" @@ -69,32 +69,32 @@ 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 = views::Accelerator(ui::VKEY_Z, false, true, false); + *accel = ui::Accelerator(ui::VKEY_Z, false, true, false); return true; case IDC_CONTENT_CONTEXT_REDO: // TODO(jcampan): should it be Ctrl-Y? - *accel = views::Accelerator(ui::VKEY_Z, true, true, false); + *accel = ui::Accelerator(ui::VKEY_Z, true, true, false); return true; case IDC_CONTENT_CONTEXT_CUT: - *accel = views::Accelerator(ui::VKEY_X, false, true, false); + *accel = ui::Accelerator(ui::VKEY_X, false, true, false); return true; case IDC_CONTENT_CONTEXT_COPY: - *accel = views::Accelerator(ui::VKEY_C, false, true, false); + *accel = ui::Accelerator(ui::VKEY_C, false, true, false); return true; case IDC_CONTENT_CONTEXT_PASTE: - *accel = views::Accelerator(ui::VKEY_V, false, true, false); + *accel = ui::Accelerator(ui::VKEY_V, false, true, false); return true; case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: - *accel = views::Accelerator(ui::VKEY_V, true, true, false); + *accel = ui::Accelerator(ui::VKEY_V, true, true, false); return true; case IDC_CONTENT_CONTEXT_SELECTALL: - *accel = views::Accelerator(ui::VKEY_A, false, true, false); + *accel = ui::Accelerator(ui::VKEY_A, false, true, false); return true; default: diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 766492b..4946b7e 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -22,8 +22,8 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/models/accelerator.h" #include "ui/base/models/table_model_observer.h" -#include "views/accelerator.h" #include "views/background.h" #include "views/context_menu_controller.h" #include "views/controls/button/text_button.h" @@ -463,8 +463,8 @@ void TaskManagerView::Init() { } kill_button_ = new views::NativeTextButton( this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_TASK_MANAGER_KILL))); - kill_button_->AddAccelerator(views::Accelerator(ui::VKEY_E, - false, false, false)); + kill_button_->AddAccelerator(ui::Accelerator(ui::VKEY_E, false, false, + false)); kill_button_->SetAccessibleKeyboardShortcut(L"E"); kill_button_->set_prefix_type(views::TextButtonBase::PREFIX_SHOW); about_memory_link_ = new views::Link( diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 79f226a..db25e0f 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -445,13 +445,13 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id, // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings. switch (command_id) { case IDC_CUT: - *accelerator = views::Accelerator(ui::VKEY_X, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false); return true; case IDC_COPY: - *accelerator = views::Accelerator(ui::VKEY_C, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false); return true; case IDC_PASTE: - *accelerator = views::Accelerator(ui::VKEY_V, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false); return true; } // Else, we retrieve the accelerator information from the frame. @@ -632,7 +632,7 @@ std::string ToolbarView::GetClassName() const { return kViewClassName; } -bool ToolbarView::AcceleratorPressed(const views::Accelerator& accelerator) { +bool ToolbarView::AcceleratorPressed(const ui::Accelerator& accelerator) { const views::View* focused_view = focus_manager_->GetFocusedView(); if (focused_view == location_bar_) return false; // Let location bar handle all accelerator events. diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index d8fb914..c677c0d 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -128,7 +128,7 @@ class ToolbarView : public views::AccessiblePaneView, virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE; virtual void OnThemeChanged() OVERRIDE; virtual std::string GetClassName() const OVERRIDE; - virtual bool AcceleratorPressed(const views::Accelerator& acc) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; // The apparent horizontal space between most items, and the vertical padding // above and below them. diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc index e748f90..25ea0789 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc +++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc @@ -33,7 +33,7 @@ void UnhandledKeyboardEventHandler::HandleKeyboardEvent( ignore_next_char_event_ = false; if (event.type == WebKit::WebInputEvent::RawKeyDown) { - views::Accelerator accelerator( + ui::Accelerator accelerator( static_cast<ui::KeyboardCode>(event.windowsKeyCode), (event.modifiers & NativeWebKeyboardEvent::ShiftKey) == NativeWebKeyboardEvent::ShiftKey, @@ -64,4 +64,3 @@ void UnhandledKeyboardEventHandler::HandleKeyboardEvent( event.os_event.wParam, event.os_event.lParam); #endif } - diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index e3fbcfa..e098423 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -257,8 +257,8 @@ string16 GetAccessibleNameForWrenchMenuItem( ui::Accelerator menu_accelerator; if (model->GetAcceleratorAt(item_index, &menu_accelerator)) { accelerator_text = - views::Accelerator(menu_accelerator.key_code(), - menu_accelerator.modifiers()).GetShortcutText(); + ui::Accelerator(menu_accelerator.key_code(), + menu_accelerator.modifiers()).GetShortcutText(); } return MenuItemView::GetAccessibleNameForMenuItem( @@ -747,7 +747,7 @@ void WrenchMenu::ExecuteCommand(int id, int mouse_event_flags) { return entry.first->ActivatedAt(entry.second); } -bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) { +bool WrenchMenu::GetAccelerator(int id, ui::Accelerator* accelerator) { if (is_bookmark_command(id)) return false; @@ -762,8 +762,8 @@ bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) { if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator)) return false; - *accelerator = views::Accelerator(menu_accelerator.key_code(), - menu_accelerator.modifiers()); + *accelerator = ui::Accelerator(menu_accelerator.key_code(), + menu_accelerator.modifiers()); return true; } diff --git a/chrome/browser/ui/views/wrench_menu.h b/chrome/browser/ui/views/wrench_menu.h index d1b7d7d..9a27f4c 100644 --- a/chrome/browser/ui/views/wrench_menu.h +++ b/chrome/browser/ui/views/wrench_menu.h @@ -68,7 +68,7 @@ class WrenchMenu : public views::MenuDelegate, virtual bool IsItemChecked(int id) const OVERRIDE; virtual bool IsCommandEnabled(int id) const OVERRIDE; virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; - virtual bool GetAccelerator(int id, views::Accelerator* accelerator) OVERRIDE; + virtual bool GetAccelerator(int id, ui::Accelerator* accelerator) OVERRIDE; virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE; // BaseBookmarkModelObserver overrides: diff --git a/views/accelerator.cc b/ui/base/models/accelerator.cc index 41a953d..45dee03 100644 --- a/views/accelerator.cc +++ b/ui/base/models/accelerator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #if defined(OS_WIN) #include <windows.h> @@ -17,7 +17,7 @@ #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" -namespace views { +namespace ui { string16 Accelerator::GetShortcutText() const { int string_id = 0; @@ -160,4 +160,4 @@ string16 Accelerator::GetShortcutText() const { return shortcut; } -} // namespace views +} // namespace ui diff --git a/ui/base/models/accelerator.h b/ui/base/models/accelerator.h index 83170b7..42de42a 100644 --- a/ui/base/models/accelerator.h +++ b/ui/base/models/accelerator.h @@ -2,11 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// This class describe a keyboard accelerator (or keyboard shortcut). +// Keyboard accelerators are registered with the FocusManager. +// It has a copy constructor and assignment operator so that it can be copied. +// It also defines the < operator so that it can be used as a key in a std::map. +// + #ifndef UI_BASE_MODELS_ACCELERATOR_H_ #define UI_BASE_MODELS_ACCELERATOR_H_ #pragma once +#include "base/string16.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/events.h" #include "ui/base/ui_export.h" namespace ui { @@ -26,6 +34,18 @@ class UI_EXPORT Accelerator { modifiers_ = accelerator.modifiers_; } + Accelerator(ui::KeyboardCode keycode, + bool shift_pressed, bool ctrl_pressed, bool alt_pressed) + : key_code_(keycode), + modifiers_(0) { + if (shift_pressed) + modifiers_ |= ui::EF_SHIFT_DOWN; + if (ctrl_pressed) + modifiers_ |= ui::EF_CONTROL_DOWN; + if (alt_pressed) + modifiers_ |= ui::EF_ALT_DOWN; + } + virtual ~Accelerator() {} Accelerator& operator=(const Accelerator& accelerator) { @@ -56,6 +76,21 @@ class UI_EXPORT Accelerator { int modifiers() const { return modifiers_; } + bool IsShiftDown() const { + return (modifiers_ & ui::EF_SHIFT_DOWN) == ui::EF_SHIFT_DOWN; + } + + bool IsCtrlDown() const { + return (modifiers_ & ui::EF_CONTROL_DOWN) == ui::EF_CONTROL_DOWN; + } + + bool IsAltDown() const { + return (modifiers_ & ui::EF_ALT_DOWN) == ui::EF_ALT_DOWN; + } + + // Returns a string with the localized shortcut if any. + string16 GetShortcutText() const; + protected: // The keycode (VK_...). ui::KeyboardCode key_code_; @@ -64,6 +99,17 @@ class UI_EXPORT Accelerator { int modifiers_; }; +// An interface that classes that want to register for keyboard accelerators +// should implement. +class UI_EXPORT AcceleratorTarget { + public: + // This method should return true if the accelerator was processed. + virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0; + + protected: + virtual ~AcceleratorTarget() {} +}; + // Since acclerator code is one of the few things that can't be cross platform // in the chrome UI, separate out just the GetAcceleratorForCommandId() from // the menu delegates. @@ -156,6 +156,7 @@ 'base/models/accelerator_cocoa.h', 'base/models/accelerator_cocoa.mm', 'base/models/accelerator_gtk.h', + 'base/models/accelerator.cc', 'base/models/accelerator.h', 'base/models/button_menu_item_model.cc', 'base/models/button_menu_item_model.h', diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index f0abe6f..6cf9caa 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -77,7 +77,7 @@ class DialogButton : public NativeTextButton { } // Overridden to forward to the delegate. - virtual bool AcceleratorPressed(const Accelerator& accelerator) { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) { if (!owner_->widget_delegate()->AsDialogDelegate()-> AreAcceleratorsEnabled(type_)) { return false; @@ -142,8 +142,8 @@ void DialogClientView::ShowDialogButtons() { if (is_default_button) default_button_ = ok_button_; if (!(buttons & ui::DIALOG_BUTTON_CANCEL)) - ok_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE, - false, false, false)); + ok_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, + false, false, false)); AddChildView(ok_button_); } if (buttons & ui::DIALOG_BUTTON_CANCEL && !cancel_button_) { @@ -165,8 +165,8 @@ void DialogClientView::ShowDialogButtons() { label, is_default_button); cancel_button_->SetGroup(kButtonGroup); - cancel_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE, - false, false, false)); + cancel_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, + false, false, false)); if (is_default_button) default_button_ = ok_button_; AddChildView(cancel_button_); @@ -174,7 +174,7 @@ void DialogClientView::ShowDialogButtons() { if (!buttons) { // Register the escape key as an accelerator which will close the window // if there are no dialog buttons. - AddAccelerator(Accelerator(ui::VKEY_ESCAPE, false, false, false)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)); } } @@ -406,7 +406,7 @@ gfx::Size DialogClientView::GetPreferredSize() { return prefsize; } -bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) { +bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) { // We only expect Escape key. DCHECK(accelerator.key_code() == ui::VKEY_ESCAPE); Close(); diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h index 093815b..719eee4 100644 --- a/ui/views/window/dialog_client_view.h +++ b/ui/views/window/dialog_client_view.h @@ -89,7 +89,7 @@ class VIEWS_EXPORT DialogClientView : public ClientView, virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child) OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE; - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // ButtonListener implementation: virtual void ButtonPressed(Button* sender, diff --git a/views/accelerator.h b/views/accelerator.h deleted file mode 100644 index 3dc2f0e9..0000000 --- a/views/accelerator.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2011 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. - -// This class describe a keyboard accelerator (or keyboard shortcut). -// Keyboard accelerators are registered with the FocusManager. -// It has a copy constructor and assignment operator so that it can be copied. -// It also defines the < operator so that it can be used as a key in a std::map. -// - -#ifndef VIEWS_ACCELERATOR_H_ -#define VIEWS_ACCELERATOR_H_ -#pragma once - -#include <string> - -#include "base/string16.h" -#include "ui/base/models/accelerator.h" -#include "views/events/event.h" -#include "views/views_export.h" - -namespace views { - -class VIEWS_EXPORT Accelerator : public ui::Accelerator { - public: - Accelerator() : ui::Accelerator() {} - - Accelerator(ui::KeyboardCode keycode, int modifiers) - : ui::Accelerator(keycode, modifiers) {} - - Accelerator(ui::KeyboardCode keycode, - bool shift_pressed, bool ctrl_pressed, bool alt_pressed) { - key_code_ = keycode; - modifiers_ = 0; - if (shift_pressed) - modifiers_ |= ui::EF_SHIFT_DOWN; - if (ctrl_pressed) - modifiers_ |= ui::EF_CONTROL_DOWN; - if (alt_pressed) - modifiers_ |= ui::EF_ALT_DOWN; - } - - virtual ~Accelerator() {} - - bool IsShiftDown() const { - return (modifiers_ & ui::EF_SHIFT_DOWN) == ui::EF_SHIFT_DOWN; - } - - bool IsCtrlDown() const { - return (modifiers_ & ui::EF_CONTROL_DOWN) == ui::EF_CONTROL_DOWN; - } - - bool IsAltDown() const { - return (modifiers_ & ui::EF_ALT_DOWN) == ui::EF_ALT_DOWN; - } - - // Returns a string with the localized shortcut if any. - string16 GetShortcutText() const; -}; - -// An interface that classes that want to register for keyboard accelerators -// should implement. -class VIEWS_EXPORT AcceleratorTarget { - public: - // This method should return true if the accelerator was processed. - virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0; - - protected: - virtual ~AcceleratorTarget() {} -}; -} - -#endif // VIEWS_ACCELERATOR_H_ diff --git a/views/accessible_pane_view.cc b/views/accessible_pane_view.cc index 437bdba..2131991 100644 --- a/views/accessible_pane_view.cc +++ b/views/accessible_pane_view.cc @@ -115,7 +115,7 @@ views::FocusTraversable* AccessiblePaneView::GetPaneFocusTraversable() { } bool AccessiblePaneView::AcceleratorPressed( - const views::Accelerator& accelerator) { + const ui::Accelerator& accelerator) { const views::View* focused_view = focus_manager_->GetFocusedView(); if (!Contains(focused_view)) diff --git a/views/accessible_pane_view.h b/views/accessible_pane_view.h index e2ad84ba..a94c4af 100644 --- a/views/accessible_pane_view.h +++ b/views/accessible_pane_view.h @@ -9,6 +9,7 @@ #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "ui/base/models/accelerator.h" #include "views/focus/focus_manager.h" #include "views/view.h" @@ -41,7 +42,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View, // Overridden from View: virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; - virtual bool AcceleratorPressed(const Accelerator& accelerator) + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual void SetVisible(bool flag) OVERRIDE; virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; @@ -84,11 +85,11 @@ class VIEWS_EXPORT AccessiblePaneView : public View, scoped_ptr<FocusSearch> focus_search_; // Registered accelerators - Accelerator home_key_; - Accelerator end_key_; - Accelerator escape_key_; - Accelerator left_key_; - Accelerator right_key_; + ui::Accelerator home_key_; + ui::Accelerator end_key_; + ui::Accelerator escape_key_; + ui::Accelerator left_key_; + ui::Accelerator right_key_; DISALLOW_COPY_AND_ASSIGN(AccessiblePaneView); }; diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc index 5d86ab89..1c54ba5 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/views/accessible_pane_view_unittest.cc @@ -4,6 +4,7 @@ #include "views/accessible_pane_view.h" +#include "ui/base/models/accelerator.h" #include "views/controls/button/text_button.h" #include "views/layout/fill_layout.h" #include "views/test/views_test_base.h" @@ -29,11 +30,11 @@ class TestBarView : public AccessiblePaneView, TextButton* third_child_button() const { return third_child_button_.get(); } TextButton* not_child_button() const { return not_child_button_.get(); } - const Accelerator& home_key() const { return home_key_; } - const Accelerator& end_key() const { return end_key_; } - const Accelerator& escape_key() const { return escape_key_; } - const Accelerator& left_key() const { return left_key_; } - const Accelerator& right_key() const { return right_key_; } + const ui::Accelerator& home_key() const { return home_key_; } + const ui::Accelerator& end_key() const { return end_key_; } + const ui::Accelerator& escape_key() const { return escape_key_; } + const ui::Accelerator& left_key() const { return left_key_; } + const ui::Accelerator& right_key() const { return right_key_; } virtual View* GetDefaultFocusableChild() OVERRIDE; diff --git a/views/bubble/bubble_delegate.cc b/views/bubble/bubble_delegate.cc index 9f99747..f5efff1 100644 --- a/views/bubble/bubble_delegate.cc +++ b/views/bubble/bubble_delegate.cc @@ -83,7 +83,7 @@ BubbleDelegateView::BubbleDelegateView() border_widget_(NULL), use_focusless_(false) { set_background(views::Background::CreateSolidBackground(color_)); - AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0)); } BubbleDelegateView::BubbleDelegateView( @@ -100,7 +100,7 @@ BubbleDelegateView::BubbleDelegateView( border_widget_(NULL), use_focusless_(false) { set_background(views::Background::CreateSolidBackground(color_)); - AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0)); + AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0)); } BubbleDelegateView::~BubbleDelegateView() { @@ -215,7 +215,8 @@ void BubbleDelegateView::ResetFade() { GetWidget()->SetOpacity(original_opacity_); } -bool BubbleDelegateView::AcceleratorPressed(const Accelerator& accelerator) { +bool BubbleDelegateView::AcceleratorPressed( + const ui::Accelerator& accelerator) { if (!close_on_esc() || accelerator.key_code() != ui::VKEY_ESCAPE) return false; if (fade_animation_.get()) diff --git a/views/bubble/bubble_delegate.h b/views/bubble/bubble_delegate.h index be02e44..55eb2e1 100644 --- a/views/bubble/bubble_delegate.h +++ b/views/bubble/bubble_delegate.h @@ -88,7 +88,7 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView, protected: // View overrides: - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Perform view initialization on the contents for bubble sizing. virtual void Init(); diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc index 05fac75..fc0c6b4 100644 --- a/views/controls/button/custom_button.cc +++ b/views/controls/button/custom_button.cc @@ -197,7 +197,7 @@ bool CustomButton::OnKeyReleased(const KeyEvent& event) { return true; } -bool CustomButton::AcceleratorPressed(const Accelerator& accelerator) { +bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { if (!View::IsEnabled()) return false; diff --git a/views/controls/button/custom_button.h b/views/controls/button/custom_button.h index 29e96d4..ae6a8bf 100644 --- a/views/controls/button/custom_button.h +++ b/views/controls/button/custom_button.h @@ -87,7 +87,7 @@ class VIEWS_EXPORT CustomButton : public Button, virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE; virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE; virtual bool OnKeyReleased(const KeyEvent& event) OVERRIDE; - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture) OVERRIDE; virtual void OnDragDone() OVERRIDE; diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 0b138cd..0c5b9cc 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -304,9 +304,9 @@ void TextButtonBase::SetIsDefault(bool is_default) { return; is_default_ = is_default; if (is_default_) - AddAccelerator(Accelerator(ui::VKEY_RETURN, false, false, false)); + AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, false, false, false)); else - RemoveAccelerator(Accelerator(ui::VKEY_RETURN, false, false, false)); + RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, false, false, false)); SchedulePaint(); } diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc index 724da9e..864b993 100644 --- a/views/controls/combobox/native_combobox_views.cc +++ b/views/controls/combobox/native_combobox_views.cc @@ -262,7 +262,7 @@ void NativeComboboxViews::ExecuteCommand(int id) { SchedulePaint(); } -bool NativeComboboxViews::GetAccelerator(int id, views::Accelerator* accel) { +bool NativeComboboxViews::GetAccelerator(int id, ui::Accelerator* accel) { return false; } diff --git a/views/controls/combobox/native_combobox_views.h b/views/controls/combobox/native_combobox_views.h index 5722e96..9a87259 100644 --- a/views/controls/combobox/native_combobox_views.h +++ b/views/controls/combobox/native_combobox_views.h @@ -58,7 +58,7 @@ class NativeComboboxViews : public views::View, virtual bool IsItemChecked(int id) const OVERRIDE; virtual bool IsCommandEnabled(int id) const OVERRIDE; virtual void ExecuteCommand(int id) OVERRIDE; - virtual bool GetAccelerator(int id, views::Accelerator* accelerator) OVERRIDE; + virtual bool GetAccelerator(int id, ui::Accelerator* accelerator) OVERRIDE; // class name of internal static const char kViewClassName[]; diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h index 9397684..b6a9633 100644 --- a/views/controls/menu/menu.h +++ b/views/controls/menu/menu.h @@ -19,9 +19,11 @@ namespace gfx { class Point; } -namespace views { - +namespace ui { class Accelerator; +} + +namespace views { class VIEWS_EXPORT Menu { public: @@ -56,7 +58,7 @@ class VIEWS_EXPORT Menu { // The delegate needs to implement this function if it wants to display // the shortcut text next to each menu item. If there is an accelerator // for a given item id, the implementor must return it. - virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel) { + virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel) { return false; } diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index df24a63..0983299 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -1066,7 +1066,7 @@ bool MenuController::SendAcceleratorToHotTrackedView() { if (!hot_view) return false; - Accelerator accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator accelerator(ui::VKEY_RETURN, false, false, false); hot_view->AcceleratorPressed(accelerator); hot_view->SetHotTracked(true); return true; diff --git a/views/controls/menu/menu_delegate.cc b/views/controls/menu/menu_delegate.cc index 6d5e8250..5ec4db4 100644 --- a/views/controls/menu/menu_delegate.cc +++ b/views/controls/menu/menu_delegate.cc @@ -26,7 +26,7 @@ string16 MenuDelegate::GetTooltipText(int id, return string16(); } -bool MenuDelegate::GetAccelerator(int id, Accelerator* accelerator) { +bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) { return false; } diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h index fbae89a..dc29eb8 100644 --- a/views/controls/menu/menu_delegate.h +++ b/views/controls/menu/menu_delegate.h @@ -24,6 +24,12 @@ class Font; } // namespace gfx +namespace ui { + +class Accelerator; + +} // namespace ui + namespace views { class DropTargetEvent; @@ -73,7 +79,7 @@ class VIEWS_EXPORT MenuDelegate { // If there is an accelerator for the menu item with id |id| it is set in // |accelerator| and true is returned. - virtual bool GetAccelerator(int id, Accelerator* accelerator); + virtual bool GetAccelerator(int id, ui::Accelerator* accelerator); // Shows the context menu with the specified id. This is invoked when the // user does the appropriate gesture to show a context menu. The id diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index f1664eb..9d0d119 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -771,7 +771,7 @@ string16 MenuItemView::GetAcceleratorText() { if(!MenuConfig::instance().show_accelerators) return string16(); - Accelerator accelerator; + ui::Accelerator accelerator; return (GetDelegate() && GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ? accelerator.GetShortcutText() : string16(); diff --git a/views/controls/menu/menu_model_adapter.cc b/views/controls/menu/menu_model_adapter.cc index 927768a..c232d2b 100644 --- a/views/controls/menu/menu_model_adapter.cc +++ b/views/controls/menu/menu_model_adapter.cc @@ -80,7 +80,7 @@ bool MenuModelAdapter::IsTriggerableEvent(MenuItemView* source, } bool MenuModelAdapter::GetAccelerator(int id, - views::Accelerator* accelerator) { + ui::Accelerator* accelerator) { ui::MenuModel* model = menu_model_; int index = 0; if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) diff --git a/views/controls/menu/menu_model_adapter.h b/views/controls/menu/menu_model_adapter.h index a85ad9f..8df4eef 100644 --- a/views/controls/menu/menu_model_adapter.h +++ b/views/controls/menu/menu_model_adapter.h @@ -46,7 +46,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate { virtual bool IsTriggerableEvent(MenuItemView* source, const MouseEvent& e) OVERRIDE; virtual bool GetAccelerator(int id, - views::Accelerator* accelerator) OVERRIDE; + ui::Accelerator* accelerator) OVERRIDE; virtual string16 GetLabel(int id) const OVERRIDE; virtual const gfx::Font& GetLabelFont(int id) const OVERRIDE; virtual bool IsCommandEnabled(int id) const OVERRIDE; diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index 1e92bc5..f08ddd1 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -12,11 +12,11 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" +#include "ui/base/models/accelerator.h" #include "ui/base/win/window_impl.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/gfx/rect.h" -#include "views/accelerator.h" namespace views { @@ -442,7 +442,7 @@ void MenuWin::AddMenuItemInternal(int index, string16 actual_label(label.empty() ? delegate()->GetLabel(item_id) : label); // Find out if there is a shortcut we need to append to the label. - views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); + ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) { actual_label += L'\t'; actual_label += accelerator.GetShortcutText(); diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index d6b8394d..85b87b5 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -16,10 +16,10 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/models/accelerator.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/font.h" #include "ui/gfx/gtk_util.h" -#include "views/accelerator.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/menu_listener.h" #include "views/controls/menu/nested_dispatcher_gtk.h" @@ -420,7 +420,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index, G_CALLBACK(OnMenuMoveCurrentThunk), this); } - views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); + ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); if (accel_group && model_->GetAcceleratorAt(index, &accelerator)) { int gdk_modifiers = 0; if (accelerator.IsShiftDown()) diff --git a/views/controls/menu/native_menu_views.cc b/views/controls/menu/native_menu_views.cc index 10d3ccf..ed8da66e 100644 --- a/views/controls/menu/native_menu_views.cc +++ b/views/controls/menu/native_menu_views.cc @@ -100,7 +100,7 @@ void NativeMenuViews::ExecuteCommand(int cmd) { model->ActivatedAt(index); } -bool NativeMenuViews::GetAccelerator(int id, views::Accelerator* accelerator) { +bool NativeMenuViews::GetAccelerator(int id, ui::Accelerator* accelerator) { int index; ui::MenuModel* model = model_; if (!ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) @@ -110,8 +110,8 @@ bool NativeMenuViews::GetAccelerator(int id, views::Accelerator* accelerator) { if (!model->GetAcceleratorAt(index, &menu_accelerator)) return false; - *accelerator = views::Accelerator(menu_accelerator.key_code(), - menu_accelerator.modifiers()); + *accelerator = ui::Accelerator(menu_accelerator.key_code(), + menu_accelerator.modifiers()); return true; } diff --git a/views/controls/menu/native_menu_views.h b/views/controls/menu/native_menu_views.h index 75e9100..33c8b92 100644 --- a/views/controls/menu/native_menu_views.h +++ b/views/controls/menu/native_menu_views.h @@ -43,7 +43,7 @@ class NativeMenuViews : public MenuWrapper, virtual bool IsItemChecked(int id) const OVERRIDE; virtual bool IsCommandEnabled(int id) const OVERRIDE; virtual void ExecuteCommand(int id) OVERRIDE; - virtual bool GetAccelerator(int id, views::Accelerator* accelerator) OVERRIDE; + virtual bool GetAccelerator(int id, ui::Accelerator* accelerator) OVERRIDE; private: void AddMenuItemsFromModel(MenuItemView* parent, ui::MenuModel* model); diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 99094ae..1b6e738 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -16,12 +16,12 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" +#include "ui/base/models/accelerator.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/gfx/native_theme.h" #include "ui/gfx/rect.h" -#include "views/accelerator.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_listener.h" @@ -684,7 +684,7 @@ void NativeMenuWin::UpdateMenuItemInfoForString(MENUITEMINFO* mii, ReplaceSubstringsAfterOffset(&formatted, 0, L"\t", L" "); if (type != ui::MenuModel::TYPE_SUBMENU) { // Add accelerator details to the label if provided. - views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); + ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); if (model_->GetAcceleratorAt(model_index, &accelerator)) { formatted += L"\t"; formatted += accelerator.GetShortcutText(); diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index 8216f29..ba71a2a 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -102,8 +102,7 @@ void MessageBoxView::ViewHierarchyChanged(bool is_add, } } -bool MessageBoxView::AcceleratorPressed( - const Accelerator& accelerator) { +bool MessageBoxView::AcceleratorPressed(const ui::Accelerator& accelerator) { // We only accepts Ctrl-C. DCHECK(accelerator.key_code() == 'C' && accelerator.IsCtrlDown()); diff --git a/views/controls/message_box_view.h b/views/controls/message_box_view.h index 453f29a..5416b4b 100644 --- a/views/controls/message_box_view.h +++ b/views/controls/message_box_view.h @@ -65,8 +65,7 @@ class VIEWS_EXPORT MessageBoxView : public View { views::View* parent, views::View* child) OVERRIDE; // Handles Ctrl-C and writes the message in the system clipboard. - virtual bool AcceleratorPressed( - const views::Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; private: // Sets up the layout manager and initializes the prompt field. This should diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc index d17a3f7..72ff0ed 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()); diff --git a/views/controls/tabbed_pane/tabbed_pane.h b/views/controls/tabbed_pane/tabbed_pane.h index d9d51df..6161d76 100644 --- a/views/controls/tabbed_pane/tabbed_pane.h +++ b/views/controls/tabbed_pane/tabbed_pane.h @@ -85,8 +85,7 @@ class VIEWS_EXPORT TabbedPane : public View { View* parent, View* child) OVERRIDE; // Handles Ctrl+Tab and Ctrl+Shift+Tab navigation of pages. - virtual bool AcceleratorPressed( - const views::Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; virtual std::string GetClassName() const OVERRIDE; virtual void OnFocus() OVERRIDE; virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc index f1c2dc0..0b0c6f6 100644 --- a/views/controls/textfield/native_textfield_win.cc +++ b/views/controls/textfield/native_textfield_win.cc @@ -416,13 +416,13 @@ bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id, // anywhere so we need to check for them explicitly here. switch (command_id) { case IDS_APP_CUT: - *accelerator = views::Accelerator(ui::VKEY_X, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false); return true; case IDS_APP_COPY: - *accelerator = views::Accelerator(ui::VKEY_C, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false); return true; case IDS_APP_PASTE: - *accelerator = views::Accelerator(ui::VKEY_V, false, true, false); + *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false); return true; } return container_view_->GetWidget()->GetAccelerator(command_id, accelerator); diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 80313ed..c0a4c657 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; } diff --git a/views/focus/accelerator_handler_gtk.cc b/views/focus/accelerator_handler_gtk.cc index e795d06..fab3b86 100644 --- a/views/focus/accelerator_handler_gtk.cc +++ b/views/focus/accelerator_handler_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "views/accelerator.h" #include "views/focus/focus_manager.h" namespace views { diff --git a/views/focus/accelerator_handler_gtk_unittest.cc b/views/focus/accelerator_handler_gtk_unittest.cc index bedd6d5..098325d 100644 --- a/views/focus/accelerator_handler_gtk_unittest.cc +++ b/views/focus/accelerator_handler_gtk_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,6 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect.h" +#include "ui/base/models/accelerator.h" #include "views/focus/accelerator_handler.h" #include "views/focus/focus_manager.h" #include "views/view.h" @@ -17,7 +18,7 @@ namespace views { class AcceleratorHandlerGtkTest : public testing::Test, public WidgetDelegate, - public AcceleratorTarget { + public ui::AcceleratorTarget { public: AcceleratorHandlerGtkTest() : kMenuAccelerator(ui::VKEY_MENU, false, false, false), @@ -58,7 +59,7 @@ class AcceleratorHandlerGtkTest } // AcceleratorTarget implementation. - virtual bool AcceleratorPressed(const Accelerator& accelerator) { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) { if (accelerator == kMenuAccelerator) menu_pressed_ = true; else if (accelerator == kHomepageAccelerator) @@ -87,8 +88,8 @@ class AcceleratorHandlerGtkTest bool home_pressed_; private: - Accelerator kMenuAccelerator; - Accelerator kHomepageAccelerator; + ui::Accelerator kMenuAccelerator; + ui::Accelerator kHomepageAccelerator; Widget* window_; View* content_view_; MessageLoopForUI message_loop_; diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 99dd049..6b452bd 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -9,7 +9,6 @@ #include <X11/extensions/XInput2.h> #include "ui/base/touch/touch_factory.h" -#include "views/accelerator.h" #include "views/events/event.h" #include "views/focus/focus_manager.h" #include "views/ime/input_method.h" diff --git a/views/focus/accelerator_handler_wayland.cc b/views/focus/accelerator_handler_wayland.cc index 1039570..6a88b03 100644 --- a/views/focus/accelerator_handler_wayland.cc +++ b/views/focus/accelerator_handler_wayland.cc @@ -4,7 +4,6 @@ #include "views/focus/accelerator_handler.h" -#include "views/accelerator.h" #include "views/focus/focus_manager.h" namespace views { diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc index 9697597..5ebcb71 100644 --- a/views/focus/focus_manager.cc +++ b/views/focus/focus_manager.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "build/build_config.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "views/accelerator.h" +#include "ui/base/models/accelerator.h" #include "views/focus/focus_search.h" #include "views/focus/view_storage.h" #include "views/focus/widget_focus_manager.h" @@ -86,10 +86,10 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) { // Process keyboard accelerators. // If the key combination matches an accelerator, the accelerator is // triggered, otherwise the key event is processed as usual. - Accelerator accelerator(event.key_code(), - event.IsShiftDown(), - event.IsControlDown(), - event.IsAltDown()); + ui::Accelerator accelerator(event.key_code(), + event.IsShiftDown(), + event.IsControlDown(), + event.IsAltDown()); if (ProcessAccelerator(accelerator)) { // If a shortcut was activated for this keydown message, do not propagate // the event further. @@ -359,16 +359,16 @@ View* FocusManager::FindFocusableView(FocusTraversable* focus_traversable, } void FocusManager::RegisterAccelerator( - const Accelerator& accelerator, - AcceleratorTarget* target) { + const ui::Accelerator& accelerator, + ui::AcceleratorTarget* target) { AcceleratorTargetList& targets = accelerators_[accelerator]; DCHECK(std::find(targets.begin(), targets.end(), target) == targets.end()) << "Registering the same target multiple times"; targets.push_front(target); } -void FocusManager::UnregisterAccelerator(const Accelerator& accelerator, - AcceleratorTarget* target) { +void FocusManager::UnregisterAccelerator(const ui::Accelerator& accelerator, + ui::AcceleratorTarget* target) { AcceleratorMap::iterator map_iter = accelerators_.find(accelerator); if (map_iter == accelerators_.end()) { NOTREACHED() << "Unregistering non-existing accelerator"; @@ -386,7 +386,7 @@ void FocusManager::UnregisterAccelerator(const Accelerator& accelerator, targets->erase(target_iter); } -void FocusManager::UnregisterAccelerators(AcceleratorTarget* target) { +void FocusManager::UnregisterAccelerators(ui::AcceleratorTarget* target) { for (AcceleratorMap::iterator map_iter = accelerators_.begin(); map_iter != accelerators_.end(); ++map_iter) { AcceleratorTargetList* targets = &map_iter->second; @@ -394,7 +394,7 @@ void FocusManager::UnregisterAccelerators(AcceleratorTarget* target) { } } -bool FocusManager::ProcessAccelerator(const Accelerator& accelerator) { +bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) { AcceleratorMap::iterator map_iter = accelerators_.find(accelerator); if (map_iter != accelerators_.end()) { // We have to copy the target list here, because an AcceleratorPressed @@ -409,8 +409,8 @@ bool FocusManager::ProcessAccelerator(const Accelerator& accelerator) { return false; } -AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator( - const views::Accelerator& accelerator) const { +ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator( + const ui::Accelerator& accelerator) const { AcceleratorMap::const_iterator map_iter = accelerators_.find(accelerator); if (map_iter == accelerators_.end() || map_iter->second.empty()) return NULL; diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h index 0fa5139..8ac84c5d 100644 --- a/views/focus/focus_manager.h +++ b/views/focus/focus_manager.h @@ -11,8 +11,10 @@ #include "base/basictypes.h" #include "base/observer_list.h" +#include "ui/base/models/accelerator.h" #include "ui/gfx/native_widget_types.h" -#include "views/accelerator.h" +#include "views/views_export.h" +#include "views/events/event.h" // The FocusManager class is used to handle focus traversal, store/restore // focused views and handle keyboard accelerators. @@ -187,15 +189,15 @@ class VIEWS_EXPORT FocusManager { // - the enter key // - any F key (F1, F2, F3 ...) // - any browser specific keys (as available on special keyboards) - void RegisterAccelerator(const Accelerator& accelerator, - AcceleratorTarget* target); + void RegisterAccelerator(const ui::Accelerator& accelerator, + ui::AcceleratorTarget* target); // Unregister the specified keyboard accelerator for the specified target. - void UnregisterAccelerator(const Accelerator& accelerator, - AcceleratorTarget* target); + void UnregisterAccelerator(const ui::Accelerator& accelerator, + ui::AcceleratorTarget* target); // Unregister all keyboard accelerator for the specified target. - void UnregisterAccelerators(AcceleratorTarget* target); + void UnregisterAccelerators(ui::AcceleratorTarget* target); // Activate the target associated with the specified accelerator. // First, AcceleratorPressed handler of the most recently registered target @@ -203,7 +205,7 @@ class VIEWS_EXPORT FocusManager { // this method immediately returns. If not, we do the same thing on the next // target, and so on. // Returns true if an accelerator was activated. - bool ProcessAccelerator(const Accelerator& accelerator); + bool ProcessAccelerator(const ui::Accelerator& accelerator); // Called by a RootView when a view within its hierarchy is removed // from its parent. This will only be called by a RootView in a @@ -219,8 +221,8 @@ class VIEWS_EXPORT FocusManager { // Returns the AcceleratorTarget that should be activated for the specified // keyboard accelerator, or NULL if no view is registered for that keyboard // accelerator. - AcceleratorTarget* GetCurrentTargetForAccelerator( - const Accelerator& accelertor) const; + ui::AcceleratorTarget* GetCurrentTargetForAccelerator( + const ui::Accelerator& accelertor) const; // Sets the focus to the specified native view. virtual void FocusNativeView(gfx::NativeView native_view); @@ -259,8 +261,8 @@ class VIEWS_EXPORT FocusManager { FocusChangeReason focus_change_reason_; // The accelerators and associated targets. - typedef std::list<AcceleratorTarget*> AcceleratorTargetList; - typedef std::map<Accelerator, AcceleratorTargetList> AcceleratorMap; + typedef std::list<ui::AcceleratorTarget*> AcceleratorTargetList; + typedef std::map<ui::Accelerator, AcceleratorTargetList> AcceleratorMap; AcceleratorMap accelerators_; // The list of registered FocusChange listeners. diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 574182d..6485405 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -8,6 +8,7 @@ #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/models/accelerator.h" #include "ui/base/models/combobox_model.h" #include "ui/gfx/rect.h" #include "views/background.h" @@ -1291,12 +1292,12 @@ TEST_F(FocusTraversalTest, PaneTraversal) { } // Counts accelerator calls. -class TestAcceleratorTarget : public AcceleratorTarget { +class TestAcceleratorTarget : public ui::AcceleratorTarget { public: explicit TestAcceleratorTarget(bool process_accelerator) : accelerator_count_(0), process_accelerator_(process_accelerator) {} - virtual bool AcceleratorPressed(const Accelerator& accelerator) { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) { ++accelerator_count_; return process_accelerator_; } @@ -1312,8 +1313,8 @@ class TestAcceleratorTarget : public AcceleratorTarget { TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) { FocusManager* focus_manager = GetFocusManager(); - Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); - Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false); TestAcceleratorTarget return_target(true); TestAcceleratorTarget escape_target(true); @@ -1403,16 +1404,16 @@ TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) { } // Unregisters itself when its accelerator is invoked. -class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget { +class SelfUnregisteringAcceleratorTarget : public ui::AcceleratorTarget { public: - SelfUnregisteringAcceleratorTarget(Accelerator accelerator, + SelfUnregisteringAcceleratorTarget(ui::Accelerator accelerator, FocusManager* focus_manager) : accelerator_(accelerator), focus_manager_(focus_manager), accelerator_count_(0) { } - virtual bool AcceleratorPressed(const Accelerator& accelerator) { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) { ++accelerator_count_; focus_manager_->UnregisterAccelerator(accelerator, this); return true; @@ -1421,7 +1422,7 @@ class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget { int accelerator_count() const { return accelerator_count_; } private: - Accelerator accelerator_; + ui::Accelerator accelerator_; FocusManager* focus_manager_; int accelerator_count_; @@ -1430,7 +1431,7 @@ class SelfUnregisteringAcceleratorTarget : public AcceleratorTarget { TEST_F(FocusManagerTest, CallsSelfDeletingAcceleratorTarget) { FocusManager* focus_manager = GetFocusManager(); - Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); SelfUnregisteringAcceleratorTarget target(return_accelerator, focus_manager); EXPECT_EQ(target.accelerator_count(), 0); EXPECT_EQ(NULL, @@ -1467,7 +1468,7 @@ class MessageTrackingView : public View { return true; } - virtual bool AcceleratorPressed(const Accelerator& accelerator) { + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) { accelerator_pressed_ = true; return true; } @@ -1506,8 +1507,8 @@ class MessageTrackingView : public View { TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) { FocusManager* focus_manager = GetFocusManager(); MessageTrackingView* mtv = new MessageTrackingView(); - mtv->AddAccelerator(Accelerator(ui::VKEY_0, false, false, false)); - mtv->AddAccelerator(Accelerator(ui::VKEY_1, false, false, false)); + mtv->AddAccelerator(ui::Accelerator(ui::VKEY_0, false, false, false)); + mtv->AddAccelerator(ui::Accelerator(ui::VKEY_1, false, false, false)); content_view_->AddChildView(mtv); focus_manager->SetFocusedView(mtv); diff --git a/views/view.cc b/views/view.cc index 698caba..1539cc5 100644 --- a/views/view.cc +++ b/views/view.cc @@ -804,9 +804,9 @@ InputMethod* View::GetInputMethod() { // Accelerators ---------------------------------------------------------------- -void View::AddAccelerator(const Accelerator& accelerator) { +void View::AddAccelerator(const ui::Accelerator& accelerator) { if (!accelerators_.get()) - accelerators_.reset(new std::vector<Accelerator>()); + accelerators_.reset(new std::vector<ui::Accelerator>()); DCHECK(std::find(accelerators_->begin(), accelerators_->end(), accelerator) == accelerators_->end()) @@ -816,13 +816,13 @@ void View::AddAccelerator(const Accelerator& accelerator) { RegisterPendingAccelerators(); } -void View::RemoveAccelerator(const Accelerator& accelerator) { +void View::RemoveAccelerator(const ui::Accelerator& accelerator) { if (!accelerators_.get()) { NOTREACHED() << "Removing non-existing accelerator"; return; } - std::vector<Accelerator>::iterator i( + std::vector<ui::Accelerator>::iterator i( std::find(accelerators_->begin(), accelerators_->end(), accelerator)); if (i == accelerators_->end()) { NOTREACHED() << "Removing non-existing accelerator"; @@ -848,7 +848,7 @@ void View::ResetAccelerators() { UnregisterAccelerators(false); } -bool View::AcceleratorPressed(const Accelerator& accelerator) { +bool View::AcceleratorPressed(const ui::Accelerator& accelerator) { return false; } @@ -1961,7 +1961,7 @@ void View::RegisterPendingAccelerators() { // Only register accelerators if we are visible. if (!IsVisibleInRootView() || !GetWidget()->IsVisible()) return; - for (std::vector<Accelerator>::const_iterator i( + for (std::vector<ui::Accelerator>::const_iterator i( accelerators_->begin() + registered_accelerator_count_); i != accelerators_->end(); ++i) { accelerator_focus_manager_->RegisterAccelerator(*i, this); diff --git a/views/view.h b/views/view.h index 222833a..0b0ae89 100644 --- a/views/view.h +++ b/views/view.h @@ -18,12 +18,13 @@ #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/models/accelerator.h" #include "ui/gfx/compositor/layer_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" -#include "views/accelerator.h" #include "views/background.h" #include "views/border.h" +#include "views/events/event.h" #if defined(OS_WIN) #include "base/win/scoped_comptr.h" @@ -98,7 +99,7 @@ class RootView; // ///////////////////////////////////////////////////////////////////////////// class VIEWS_EXPORT View : public ui::LayerDelegate, - public AcceleratorTarget { + public ui::AcceleratorTarget { public: typedef std::vector<View*> Views; @@ -636,16 +637,16 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, // accelerator key combination, the AcceleratorPressed method is invoked. // Note that you can set multiple accelerators for a view by invoking this // method several times. - virtual void AddAccelerator(const Accelerator& accelerator); + virtual void AddAccelerator(const ui::Accelerator& accelerator); // Removes the specified accelerator for this view. - virtual void RemoveAccelerator(const Accelerator& accelerator); + virtual void RemoveAccelerator(const ui::Accelerator& accelerator); // Removes all the keyboard accelerators for this view. virtual void ResetAccelerators(); // Overridden from AcceleratorTarget: - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Focus --------------------------------------------------------------------- @@ -1410,7 +1411,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, // The list of accelerators. List elements in the range // [0, registered_accelerator_count_) are already registered to FocusManager, // and the rest are not yet. - scoped_ptr<std::vector<Accelerator> > accelerators_; + scoped_ptr<std::vector<ui::Accelerator> > accelerators_; size_t registered_accelerator_count_; // Focus --------------------------------------------------------------------- diff --git a/views/view_unittest.cc b/views/view_unittest.cc index d1b032d..545c1ab 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -12,6 +12,7 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/models/accelerator.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" @@ -215,7 +216,7 @@ class TestView : public View { virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE; virtual void Paint(gfx::Canvas* canvas) OVERRIDE; virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; - virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // OnBoundsChanged. bool did_change_bounds_; @@ -237,7 +238,7 @@ class TestView : public View { SkRect last_clip_; // Accelerators. - std::map<Accelerator, int> accelerator_count_map_; + std::map<ui::Accelerator, int> accelerator_count_map_; }; // Mock instance of the GestureManager for testing. @@ -963,7 +964,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) { //////////////////////////////////////////////////////////////////////////////// // Accelerators //////////////////////////////////////////////////////////////////////////////// -bool TestView::AcceleratorPressed(const Accelerator& accelerator) { +bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) { accelerator_count_map_[accelerator]++; return true; } @@ -971,7 +972,7 @@ bool TestView::AcceleratorPressed(const Accelerator& accelerator) { #if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, ActivateAccelerator) { // Register a keyboard accelerator before the view is added to a window. - Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); @@ -996,7 +997,7 @@ TEST_F(ViewTest, ActivateAccelerator) { EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1); // Hit the escape key. Nothing should happen. - Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false); EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator)); EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1); EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 0); @@ -1037,7 +1038,7 @@ TEST_F(ViewTest, ActivateAccelerator) { #if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, HiddenViewWithAccelerator) { - Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); @@ -1069,7 +1070,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) { #if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) { - Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); diff --git a/views/views.gyp b/views/views.gyp index 148904f9..30c4dc7 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -55,8 +55,6 @@ ], 'sources': [ # All .cc, .h under views, except unittests - 'accelerator.cc', - 'accelerator.h', 'accessibility/native_view_accessibility_win.cc', 'accessibility/native_view_accessibility_win.h', 'accessible_pane_view.cc', diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index 88a2f6e..240c2ad 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -614,7 +614,7 @@ bool NativeWidgetGtk::HandleKeyboardEvent(const KeyEvent& key) { (key.flags() & ~ui::EF_ALT_DOWN) == 0) { // Trigger VKEY_MENU when only this key is pressed and released, and both // press and release events are not handled by others. - Accelerator accelerator(ui::VKEY_MENU, false, false, false); + ui::Accelerator accelerator(ui::VKEY_MENU, false, false, false); handled = GetWidget()->GetFocusManager()->ProcessAccelerator(accelerator); } diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc index e31196e..8b98ffa 100644 --- a/views/widget/native_widget_win.cc +++ b/views/widget/native_widget_win.cc @@ -1879,10 +1879,10 @@ void NativeWidgetWin::OnSysCommand(UINT notification_code, CPoint click) { if ((notification_code & sc_mask) == SC_KEYMENU && click.x == 0) { // Retrieve the status of shift and control keys to prevent consuming // shift+alt keys, which are used by Windows to change input languages. - Accelerator accelerator(ui::KeyboardCodeForWindowsKeyCode(VK_MENU), - !!(GetKeyState(VK_SHIFT) & 0x8000), - !!(GetKeyState(VK_CONTROL) & 0x8000), - false); + ui::Accelerator accelerator(ui::KeyboardCodeForWindowsKeyCode(VK_MENU), + !!(GetKeyState(VK_SHIFT) & 0x8000), + !!(GetKeyState(VK_CONTROL) & 0x8000), + false); GetWidget()->GetFocusManager()->ProcessAccelerator(accelerator); return; } |