summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/button/custom_button.cc2
-rw-r--r--views/controls/button/custom_button.h2
-rw-r--r--views/controls/button/text_button.cc4
-rw-r--r--views/controls/combobox/native_combobox_views.cc2
-rw-r--r--views/controls/combobox/native_combobox_views.h2
-rw-r--r--views/controls/menu/menu.h8
-rw-r--r--views/controls/menu/menu_controller.cc2
-rw-r--r--views/controls/menu/menu_delegate.cc2
-rw-r--r--views/controls/menu/menu_delegate.h8
-rw-r--r--views/controls/menu/menu_item_view.cc2
-rw-r--r--views/controls/menu/menu_model_adapter.cc2
-rw-r--r--views/controls/menu/menu_model_adapter.h2
-rw-r--r--views/controls/menu/menu_win.cc4
-rw-r--r--views/controls/menu/native_menu_gtk.cc4
-rw-r--r--views/controls/menu/native_menu_views.cc6
-rw-r--r--views/controls/menu/native_menu_views.h2
-rw-r--r--views/controls/menu/native_menu_win.cc4
-rw-r--r--views/controls/message_box_view.cc3
-rw-r--r--views/controls/message_box_view.h3
-rw-r--r--views/controls/tabbed_pane/tabbed_pane.cc6
-rw-r--r--views/controls/tabbed_pane/tabbed_pane.h3
-rw-r--r--views/controls/textfield/native_textfield_win.cc6
-rw-r--r--views/controls/tree/tree_view.cc9
23 files changed, 47 insertions, 41 deletions
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;
}
generated by cgit v1.1 at 2025-03-30 16:10:33 +0000