diff options
Diffstat (limited to 'chrome/browser/ui')
32 files changed, 118 insertions, 106 deletions
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: |