summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/ui/panels/panel_browser_view.cc2
-rw-r--r--chrome/browser/ui/views/accessible_pane_view.cc2
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc2
-rw-r--r--chrome/browser/ui/views/find_bar_host.cc2
-rw-r--r--chrome/browser/ui/views/frame/browser_view.cc4
-rw-r--r--chrome/browser/ui/views/html_dialog_view.cc2
-rw-r--r--chrome/browser/ui/views/wrench_menu.cc4
-rw-r--r--ui/base/models/accelerator.h16
-rw-r--r--ui/views/events/accelerator.cc18
-rw-r--r--views/controls/button/custom_button.cc2
-rw-r--r--views/controls/menu/native_menu_gtk.cc4
-rw-r--r--views/controls/menu/native_menu_x.cc4
-rw-r--r--views/controls/message_box_view.cc2
-rw-r--r--views/controls/tabbed_pane/tabbed_pane.cc2
-rw-r--r--views/window/dialog_client_view.cc4
15 files changed, 31 insertions, 39 deletions
diff --git a/chrome/browser/ui/panels/panel_browser_view.cc b/chrome/browser/ui/panels/panel_browser_view.cc
index c04921d..82b9efe 100644
--- a/chrome/browser/ui/panels/panel_browser_view.cc
+++ b/chrome/browser/ui/panels/panel_browser_view.cc
@@ -68,7 +68,7 @@ void PanelBrowserView::OnWindowActivationChanged(bool active) {
bool PanelBrowserView::AcceleratorPressed(
const views::Accelerator& accelerator) {
- if (mouse_pressed_ && accelerator.GetKeyCode() == ui::VKEY_ESCAPE) {
+ if (mouse_pressed_ && accelerator.key_code() == ui::VKEY_ESCAPE) {
OnTitleBarMouseCaptureLost();
return true;
}
diff --git a/chrome/browser/ui/views/accessible_pane_view.cc b/chrome/browser/ui/views/accessible_pane_view.cc
index 8b9d680..aa7b2d1 100644
--- a/chrome/browser/ui/views/accessible_pane_view.cc
+++ b/chrome/browser/ui/views/accessible_pane_view.cc
@@ -165,7 +165,7 @@ bool AccessiblePaneView::AcceleratorPressed(
return false;
}
- switch (accelerator.GetKeyCode()) {
+ switch (accelerator.key_code()) {
case ui::VKEY_ESCAPE:
RemovePaneFocus();
RestoreLastFocusedView();
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index e33ebe1..b1cc21b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -143,7 +143,7 @@ void BookmarkBubbleView::BubbleShown() {
bool BookmarkBubbleView::AcceleratorPressed(
const views::Accelerator& accelerator) {
- if (accelerator.GetKeyCode() != ui::VKEY_RETURN)
+ if (accelerator.key_code() != ui::VKEY_RETURN)
return false;
if (edit_button_->HasFocus())
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc
index 5d8fa70..06f89b2 100644
--- a/chrome/browser/ui/views/find_bar_host.cc
+++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -172,7 +172,7 @@ FindBarTesting* FindBarHost::GetFindBarTesting() {
// FindBarWin, views::AcceleratorTarget implementation:
bool FindBarHost::AcceleratorPressed(const views::Accelerator& accelerator) {
- ui::KeyboardCode key = accelerator.GetKeyCode();
+ 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.
find_bar_controller_->EndFindSession(FindBarController::kActivateSelection);
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index af396d7..d1c1b47 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -473,7 +473,7 @@ bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
// If accessibility is enabled, stop speech and return false so that key
// combinations involving Search can be used for extra accessibility
// functionality.
- if (accelerator.GetKeyCode() == ui::VKEY_LWIN &&
+ if (accelerator.key_code() == ui::VKEY_LWIN &&
g_browser_process->local_state()->GetBoolean(
prefs::kAccessibilityEnabled)) {
ExtensionTtsController::GetInstance()->Stop();
@@ -2482,7 +2482,7 @@ void BrowserView::UpdateAcceleratorMetrics(
#if defined(OS_CHROMEOS)
// Collect information about the relative popularity of various accelerators
// on Chrome OS.
- const ui::KeyboardCode key_code = accelerator.GetKeyCode();
+ const ui::KeyboardCode key_code = accelerator.key_code();
switch (command_id) {
case IDC_BACK:
if (key_code == ui::VKEY_BACK)
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index d373846..67341f2 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -60,7 +60,7 @@ gfx::Size HtmlDialogView::GetPreferredSize() {
bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) {
// Pressing ESC closes the dialog.
- DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.GetKeyCode());
+ DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
OnWindowClosed();
OnDialogClosed(std::string());
return true;
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index d1910e2..b7daf65 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -251,7 +251,7 @@ string16 GetAccessibleNameForWrenchMenuItem(
ui::Accelerator menu_accelerator;
if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
accelerator_text =
- views::Accelerator(menu_accelerator.GetKeyCode(),
+ views::Accelerator(menu_accelerator.key_code(),
menu_accelerator.modifiers()).GetShortcutText();
}
@@ -637,7 +637,7 @@ bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) {
if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator))
return false;
- *accelerator = views::Accelerator(menu_accelerator.GetKeyCode(),
+ *accelerator = views::Accelerator(menu_accelerator.key_code(),
menu_accelerator.modifiers());
return true;
}
diff --git a/ui/base/models/accelerator.h b/ui/base/models/accelerator.h
index 137f999..6ea1311 100644
--- a/ui/base/models/accelerator.h
+++ b/ui/base/models/accelerator.h
@@ -12,7 +12,6 @@ namespace ui {
// This is a cross-platform base class for accelerator keys used in menus. It is
// meant to be subclassed for concrete toolkit implementations.
-
class Accelerator {
public:
Accelerator() : key_code_(ui::VKEY_UNKNOWN), modifiers_(0) {}
@@ -52,14 +51,9 @@ class Accelerator {
return !(*this == rhs);
}
- // TODO(beng): unix_hacker
- ui::KeyboardCode GetKeyCode() const {
- return key_code_;
- }
+ ui::KeyboardCode key_code() const { return key_code_; }
- int modifiers() const {
- return modifiers_;
- }
+ int modifiers() const { return modifiers_; }
protected:
// The keycode (VK_...).
@@ -76,9 +70,8 @@ class AcceleratorProvider {
public:
// Gets the accelerator for the specified command id. Returns true if the
// command id has a valid accelerator, false otherwise.
- virtual bool GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) = 0;
+ virtual bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) = 0;
protected:
virtual ~AcceleratorProvider() {}
@@ -87,4 +80,3 @@ class AcceleratorProvider {
} // namespace ui
#endif // UI_BASE_MODELS_ACCELERATOR_H_
-
diff --git a/ui/views/events/accelerator.cc b/ui/views/events/accelerator.cc
index 582c3a3..1e8592f 100644
--- a/ui/views/events/accelerator.cc
+++ b/ui/views/events/accelerator.cc
@@ -22,22 +22,22 @@ namespace ui {
namespace {
bool IsShiftDown(const Accelerator& accelerator) {
- return (accelerator.GetKeyCode() & VKEY_SHIFT) == VKEY_SHIFT;
+ return (accelerator.key_code() & VKEY_SHIFT) == VKEY_SHIFT;
}
bool IsCtrlDown(const Accelerator& accelerator) {
- return (accelerator.GetKeyCode() & VKEY_CONTROL) == VKEY_CONTROL;
+ return (accelerator.key_code() & VKEY_CONTROL) == VKEY_CONTROL;
}
bool IsAltDown(const Accelerator& accelerator) {
- return (accelerator.GetKeyCode() & VKEY_MENU) == VKEY_MENU;
+ return (accelerator.key_code() & VKEY_MENU) == VKEY_MENU;
}
} // namespace
string16 GetShortcutTextForAccelerator(const Accelerator& accelerator) {
int string_id = 0;
- switch(accelerator.GetKeyCode()) {
+ switch(accelerator.key_code()) {
case ui::VKEY_TAB:
string_id = IDS_APP_TAB_KEY;
break;
@@ -94,19 +94,19 @@ string16 GetShortcutTextForAccelerator(const Accelerator& accelerator) {
// accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
// default zoom level), we leave VK_[0-9] alone without translation.
wchar_t key;
- if (accelerator.GetKeyCode() >= '0' && accelerator.GetKeyCode() <= '9')
- key = accelerator.GetKeyCode();
+ if (accelerator.key_code() >= '0' && accelerator.key_code() <= '9')
+ key = accelerator.key_code();
else
- key = LOWORD(::MapVirtualKeyW(accelerator.GetKeyCode(), MAPVK_VK_TO_CHAR));
+ key = LOWORD(::MapVirtualKeyW(accelerator.key_code(), MAPVK_VK_TO_CHAR));
shortcut += key;
#elif defined(OS_LINUX)
const gchar* name = NULL;
- switch (accelerator.GetKeyCode()) {
+ switch (accelerator.key_code()) {
case ui::VKEY_OEM_2:
name = static_cast<const gchar*>("/");
break;
default:
- name = gdk_keyval_name(gdk_keyval_to_lower(accelerator.GetKeyCode()));
+ name = gdk_keyval_name(gdk_keyval_to_lower(accelerator.key_code()));
break;
}
if (name) {
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index 55acba8..95ecb98 100644
--- a/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.cc
@@ -200,7 +200,7 @@ bool CustomButton::AcceleratorPressed(const Accelerator& accelerator) {
return false;
SetState(BS_NORMAL);
- KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.GetKeyCode(),
+ KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
accelerator.modifiers());
NotifyClick(key_event);
return true;
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index b9db871..8a87830 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -13,8 +13,8 @@
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/models/menu_model.h"
#include "ui/gfx/font.h"
#include "ui/gfx/gtk_util.h"
@@ -439,7 +439,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
if (accelerator.IsAltDown())
gdk_modifiers |= GDK_MOD1_MASK;
gtk_widget_add_accelerator(menu_item, "activate", accel_group,
- ui::GdkKeyCodeForWindowsKeyCode(accelerator.GetKeyCode(), false),
+ ui::GdkKeyCodeForWindowsKeyCode(accelerator.key_code(), false),
static_cast<GdkModifierType>(gdk_modifiers), GTK_ACCEL_VISIBLE);
}
diff --git a/views/controls/menu/native_menu_x.cc b/views/controls/menu/native_menu_x.cc
index 9771dd5..eb96042 100644
--- a/views/controls/menu/native_menu_x.cc
+++ b/views/controls/menu/native_menu_x.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.
@@ -103,7 +103,7 @@ bool NativeMenuX::GetAccelerator(int id, views::Accelerator* accelerator) {
if (!model->GetAcceleratorAt(index, &menu_accelerator))
return false;
- *accelerator = views::Accelerator(menu_accelerator.GetKeyCode(),
+ *accelerator = views::Accelerator(menu_accelerator.key_code(),
menu_accelerator.modifiers());
return true;
}
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index d5e2122..df35312 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -100,7 +100,7 @@ void MessageBoxView::ViewHierarchyChanged(bool is_add,
bool MessageBoxView::AcceleratorPressed(
const Accelerator& accelerator) {
// We only accepts Ctrl-C.
- DCHECK(accelerator.GetKeyCode() == 'C' && accelerator.IsCtrlDown());
+ DCHECK(accelerator.key_code() == 'C' && accelerator.IsCtrlDown());
// We must not intercept Ctrl-C when we have a text box and it's focused.
if (prompt_field_ && prompt_field_->HasFocus())
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index aba0f7b..c6097e8 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -97,7 +97,7 @@ void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) {
// We only accept Ctrl+Tab keyboard events.
- DCHECK(accelerator.GetKeyCode() ==
+ DCHECK(accelerator.key_code() ==
ui::VKEY_TAB && accelerator.IsCtrlDown());
int tab_count = GetTabCount();
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index b3b5c9a..fc9fb4c 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -30,8 +30,8 @@
#include "ui/gfx/native_theme.h"
#else
#include "ui/gfx/skia_utils_gtk.h"
-#include "views/window/hit_test.h"
#include "views/widget/widget.h"
+#include "views/window/hit_test.h"
#endif
using ui::MessageBoxFlags;
@@ -396,7 +396,7 @@ gfx::Size DialogClientView::GetPreferredSize() {
bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) {
// We only expect Escape key.
- DCHECK(accelerator.GetKeyCode() == ui::VKEY_ESCAPE);
+ DCHECK(accelerator.key_code() == ui::VKEY_ESCAPE);
Close();
return true;
}
generated by cgit v1.1 at 2025-02-25 20:10:35 +0000