summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 17:36:16 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 17:36:16 +0000
commit54f1a7944423ebaf5095cbec80732c6c3294c92f (patch)
tree8d8dd89bc91e68270f59a16d00904212c8ee19e3 /chrome/views
parent257ab718488a1cdb46a2423464e17933c8339a01 (diff)
downloadchromium_src-54f1a7944423ebaf5095cbec80732c6c3294c92f.zip
chromium_src-54f1a7944423ebaf5095cbec80732c6c3294c92f.tar.gz
chromium_src-54f1a7944423ebaf5095cbec80732c6c3294c92f.tar.bz2
Fix typo. Original patch by Shinichiro Hamaji (see http://codereview.chromium.org/67123 ), r=me.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/widget/root_view.cc18
-rw-r--r--chrome/views/widget/root_view.h2
2 files changed, 10 insertions, 10 deletions
diff --git a/chrome/views/widget/root_view.cc b/chrome/views/widget/root_view.cc
index 7881074..eed1730 100644
--- a/chrome/views/widget/root_view.cc
+++ b/chrome/views/widget/root_view.cc
@@ -68,7 +68,7 @@ RootView::RootView(Widget* widget)
#if defined(OS_WIN)
previous_cursor_(NULL),
#endif
- default_keyboard_hander_(NULL),
+ default_keyboard_handler_(NULL),
focus_listener_(NULL),
focus_on_mouse_pressed_(false),
ignore_set_focus_calls_(false),
@@ -258,8 +258,8 @@ void RootView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
if (child == drag_view_)
drag_view_ = NULL;
- if (default_keyboard_hander_ == child) {
- default_keyboard_hander_ = NULL;
+ if (default_keyboard_handler_ == child) {
+ default_keyboard_handler_ = NULL;
}
NotificationService::current()->Notify(
NotificationType::VIEW_REMOVED,
@@ -871,10 +871,10 @@ bool RootView::ProcessKeyEvent(const KeyEvent& event) {
v->OnKeyPressed(event) : v->OnKeyReleased(event);
}
- if (!consumed && default_keyboard_hander_) {
+ if (!consumed && default_keyboard_handler_) {
consumed = (event.GetType() == Event::ET_KEY_PRESSED) ?
- default_keyboard_hander_->OnKeyPressed(event) :
- default_keyboard_hander_->OnKeyReleased(event);
+ default_keyboard_handler_->OnKeyPressed(event) :
+ default_keyboard_handler_->OnKeyReleased(event);
}
return consumed;
@@ -890,14 +890,14 @@ bool RootView::ProcessMouseWheelEvent(const MouseWheelEvent& e) {
}
}
- if (!consumed && default_keyboard_hander_) {
- consumed = default_keyboard_hander_->OnMouseWheel(e);
+ if (!consumed && default_keyboard_handler_) {
+ consumed = default_keyboard_handler_->OnMouseWheel(e);
}
return consumed;
}
void RootView::SetDefaultKeyboardHandler(View* v) {
- default_keyboard_hander_ = v;
+ default_keyboard_handler_ = v;
}
bool RootView::IsVisibleInRootView() const {
diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h
index 73d49cb..091e48d 100644
--- a/chrome/views/widget/root_view.h
+++ b/chrome/views/widget/root_view.h
@@ -316,7 +316,7 @@ class RootView : public View,
#endif
// Default keyboard handler
- View* default_keyboard_hander_;
+ View* default_keyboard_handler_;
// The listener that gets focus change notifications.
FocusListener* focus_listener_;