Clean up some event code:

Update some RootView event construction.
Fixup some *MouseExited/OnLeaveNotify codepaths.
Normalize event argument names.
Move View::ConvertPoint*Ancestor defs to private section.

Review URL: http://codereview.chromium.org/6685018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78121 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 109 insertions, 94 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
index 184aa9d..922908a 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
@@ -53,13 +53,14 @@ class AutocompleteTextfield : public views::Textfield {
     autocomplete_edit_view_->HandleFocusOut();
   }
 
-  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE {
-    bool handled = views::Textfield::OnKeyPressed(e);
-    return autocomplete_edit_view_->HandleAfterKeyEvent(e, handled) || handled;
+  virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE {
+    bool handled = views::Textfield::OnKeyPressed(event);
+    return autocomplete_edit_view_->HandleAfterKeyEvent(event, handled) ||
+        handled;
   }
 
-  virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE {
-    return autocomplete_edit_view_->HandleKeyReleaseEvent(e);
+  virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE {
+    return autocomplete_edit_view_->HandleKeyReleaseEvent(event);
   }
 
   virtual bool IsFocusable() const OVERRIDE {
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 68211de..6adb0be 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -1007,12 +1007,13 @@ void AutocompleteEditViewWin::PasteAndGo(const string16& text) {
 }
 
 bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
-    const views::KeyEvent& e) {
-  ui::KeyboardCode key = e.key_code();
+    const views::KeyEvent& event) {
+  ui::KeyboardCode key = event.key_code();
   // We don't process ALT + numpad digit as accelerators, they are used for
   // entering special characters.  We do translate alt-home.
-  if (e.IsAltDown() && (key != ui::VKEY_HOME) &&
-      views::NativeTextfieldWin::IsNumPadDigit(key, views::IsExtendedKey(e)))
+  if (event.IsAltDown() && (key != ui::VKEY_HOME) &&
+      views::NativeTextfieldWin::IsNumPadDigit(key,
+                                               views::IsExtendedKey(event)))
     return true;
 
   // Skip accelerators for key combinations omnibox wants to crack. This list
@@ -1033,15 +1034,16 @@ bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
 
     case ui::VKEY_UP:
     case ui::VKEY_DOWN:
-      return !e.IsAltDown();
+      return !event.IsAltDown();
 
     case ui::VKEY_DELETE:
     case ui::VKEY_INSERT:
-      return !e.IsAltDown() && e.IsShiftDown() && !e.IsControlDown();
+      return !event.IsAltDown() && event.IsShiftDown() &&
+          !event.IsControlDown();
 
     case ui::VKEY_X:
     case ui::VKEY_V:
-      return !e.IsAltDown() && e.IsControlDown();
+      return !event.IsAltDown() && event.IsControlDown();
 
     case ui::VKEY_BACK:
     case ui::VKEY_OEM_PLUS:
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
index fb6bfd5..e0b57f9 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
@@ -168,7 +168,7 @@ class AutocompleteEditViewWin
 
   // Called before an accelerator is processed to give us a chance to override
   // it.
-  bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e);
+  bool SkipDefaultKeyEventProcessing(const views::KeyEvent& event);
 
   // Handler for external events passed in to us.  The View that owns us may
   // send us events that we should treat as if they were events on us.
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index 722f298..3195eb1 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.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.
 
@@ -130,14 +130,14 @@ void UpdateTouchPointPosition(const views::TouchEvent* event,
   tpoint->screenPosition.y = tpoint->position.y + origin.y();
 }
 
-void InitializeWebMouseEventFromViewsEvent(const views::LocatedEvent& e,
+void InitializeWebMouseEventFromViewsEvent(const views::LocatedEvent& event,
                                            const gfx::Point& origin,
                                            WebKit::WebMouseEvent* wmevent) {
   wmevent->timeStampSeconds = base::Time::Now().ToDoubleT();
-  wmevent->modifiers = WebInputEventFlagsFromViewsEvent(e);
+  wmevent->modifiers = WebInputEventFlagsFromViewsEvent(event);
 
-  wmevent->windowX = wmevent->x = e.x();
-  wmevent->windowY = wmevent->y = e.y();
+  wmevent->windowX = wmevent->x = event.x();
+  wmevent->windowY = wmevent->y = event.y();
   wmevent->globalX = wmevent->x + origin.x();
   wmevent->globalY = wmevent->y + origin.y();
 }
@@ -681,30 +681,31 @@ void RenderWidgetHostViewViews::OnMouseExited(const views::MouseEvent& event) {
   // Already generated synthetically by webkit.
 }
 
-bool RenderWidgetHostViewViews::OnMouseWheel(const views::MouseWheelEvent& e) {
+bool RenderWidgetHostViewViews::OnMouseWheel(
+    const views::MouseWheelEvent& event) {
   WebMouseWheelEvent wmwe;
-  InitializeWebMouseEventFromViewsEvent(e, GetMirroredPosition(), &wmwe);
+  InitializeWebMouseEventFromViewsEvent(event, GetMirroredPosition(), &wmwe);
 
   wmwe.type = WebKit::WebInputEvent::MouseWheel;
   wmwe.button = WebKit::WebMouseEvent::ButtonNone;
 
   // TODO(sadrul): How do we determine if it's a horizontal scroll?
-  wmwe.deltaY = e.offset();
+  wmwe.deltaY = event.offset();
   wmwe.wheelTicksY = wmwe.deltaY > 0 ? 1 : -1;
 
   GetRenderWidgetHost()->ForwardWheelEvent(wmwe);
   return true;
 }
 
-bool RenderWidgetHostViewViews::OnKeyPressed(const views::KeyEvent& e) {
-  if (!ime_context_->FilterKeyEvent(e))
-    ForwardKeyEvent(e);
+bool RenderWidgetHostViewViews::OnKeyPressed(const views::KeyEvent& event) {
+  if (!ime_context_->FilterKeyEvent(event))
+    ForwardKeyEvent(event);
   return TRUE;
 }
 
-bool RenderWidgetHostViewViews::OnKeyReleased(const views::KeyEvent& e) {
-  if (!ime_context_->FilterKeyEvent(e))
-    ForwardKeyEvent(e);
+bool RenderWidgetHostViewViews::OnKeyReleased(const views::KeyEvent& event) {
+  if (!ime_context_->FilterKeyEvent(event))
+    ForwardKeyEvent(event);
   return TRUE;
 }
 
@@ -861,18 +862,18 @@ void RenderWidgetHostViewViews::ForwardWebKeyboardEvent(
 }
 
 views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
-    const views::TouchEvent& e) {
+    const views::TouchEvent& event) {
   // Update the list of touch points first.
   WebKit::WebTouchPoint* point = NULL;
   TouchStatus status = TOUCH_STATUS_UNKNOWN;
 
-  switch (e.type()) {
+  switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
       // Add a new touch point.
       if (touch_event_.touchPointsLength <
           WebTouchEvent::touchPointsLengthCap) {
         point = &touch_event_.touchPoints[touch_event_.touchPointsLength++];
-        point->id = e.identity();
+        point->id = event.identity();
 
         if (touch_event_.touchPointsLength == 1) {
           // A new touch sequence has started.
@@ -892,7 +893,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
       // simple loop should be sufficient.
       for (int i = 0; i < touch_event_.touchPointsLength; ++i) {
         point = touch_event_.touchPoints + i;
-        if (point->id == e.identity()) {
+        if (point->id == event.identity()) {
           break;
         }
         point = NULL;
@@ -900,7 +901,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
       break;
     }
     default:
-      DLOG(WARNING) << "Unknown touch event " << e.type();
+      DLOG(WARNING) << "Unknown touch event " << event.type();
       break;
   }
 
@@ -911,16 +912,16 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
     status = TOUCH_STATUS_CONTINUE;
 
   // Update the location and state of the point.
-  point->state = TouchPointStateFromEvent(&e);
+  point->state = TouchPointStateFromEvent(&event);
   if (point->state == WebKit::WebTouchPoint::StateMoved) {
     // It is possible for badly written touch drivers to emit Move events even
     // when the touch location hasn't changed. In such cases, consume the event
     // and pretend nothing happened.
-    if (point->position.x == e.x() && point->position.y == e.y()) {
+    if (point->position.x == event.x() && point->position.y == event.y()) {
       return status;
     }
   }
-  UpdateTouchPointPosition(&e, GetMirroredPosition(), point);
+  UpdateTouchPointPosition(&event, GetMirroredPosition(), point);
 
   // Mark the rest of the points as stationary.
   for (int i = 0; i < touch_event_.touchPointsLength; ++i) {
@@ -931,14 +932,14 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
   }
 
   // Update the type of the touch event.
-  touch_event_.type = TouchEventTypeFromEvent(&e);
+  touch_event_.type = TouchEventTypeFromEvent(&event);
   touch_event_.timeStampSeconds = base::Time::Now().ToDoubleT();
 
   // The event and all the touches have been updated. Dispatch.
   host_->ForwardTouchEvent(touch_event_);
 
   // If the touch was released, then remove it from the list of touch points.
-  if (e.type() == ui::ET_TOUCH_RELEASED) {
+  if (event.type() == ui::ET_TOUCH_RELEASED) {
     --touch_event_.touchPointsLength;
     for (int i = point - touch_event_.touchPoints;
          i < touch_event_.touchPointsLength;
@@ -947,7 +948,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
     }
     if (touch_event_.touchPointsLength == 0)
       status = TOUCH_STATUS_END;
-  } else if (e.type() == ui::ET_TOUCH_CANCELLED) {
+  } else if (event.type() == ui::ET_TOUCH_CANCELLED) {
     status = TOUCH_STATUS_CANCEL;
   }
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h
index ec6c6fc..538c45a 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.h
@@ -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.
 
@@ -101,14 +101,14 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView,
   virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event,
                                bool canceled) OVERRIDE;
-  virtual void OnMouseMoved(const views::MouseEvent& e) OVERRIDE;
+  virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
-  virtual bool OnMouseWheel(const views::MouseWheelEvent& e) OVERRIDE;
+  virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
 
   // Views keyboard events, overridden from views::View.
-  virtual bool OnKeyPressed(const views::KeyEvent &e) OVERRIDE;
-  virtual bool OnKeyReleased(const views::KeyEvent &e) OVERRIDE;
+  virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE;
+  virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE;
 
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
@@ -120,7 +120,8 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView,
   void ForwardKeyEvent(const views::KeyEvent& event);
 
   // Views touch events, overridden from views::View.
-  virtual View::TouchStatus OnTouchEvent(const views::TouchEvent& e) OVERRIDE;
+  virtual View::TouchStatus OnTouchEvent(
+      const views::TouchEvent& event) OVERRIDE;
 
  private:
   friend class RenderWidgetHostViewViewsWidget;
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
index e29779a..2373d29 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
@@ -77,12 +77,13 @@ class AutocompletePopupContentsView : public views::View,
   virtual void PaintChildren(gfx::Canvas* canvas);
   virtual void Layout();
   virtual void LayoutChildren();
-  virtual void OnMouseEntered(const views::MouseEvent& event);
-  virtual void OnMouseMoved(const views::MouseEvent& event);
-  virtual void OnMouseExited(const views::MouseEvent& event);
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
-  virtual bool OnMouseDragged(const views::MouseEvent& event);
+  virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event,
+                               bool canceled) OVERRIDE;
+  virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
   virtual views::View* GetEventHandlerForPoint(const gfx::Point& point);
 
  protected:
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 984590b..faf7879 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -209,10 +209,10 @@ bool BrowserActionButton::Activate() {
   return false;
 }
 
-bool BrowserActionButton::OnMousePressed(const views::MouseEvent& e) {
-  if (!e.IsRightMouseButton()) {
+bool BrowserActionButton::OnMousePressed(const views::MouseEvent& event) {
+  if (!event.IsRightMouseButton()) {
     return IsPopup() ?
-        MenuButton::OnMousePressed(e) : TextButton::OnMousePressed(e);
+        MenuButton::OnMousePressed(event) : TextButton::OnMousePressed(event);
   }
 
   // Get the top left point of this button in screen coordinates.
@@ -226,27 +226,27 @@ bool BrowserActionButton::OnMousePressed(const views::MouseEvent& e) {
   return false;
 }
 
-void BrowserActionButton::OnMouseReleased(const views::MouseEvent& e,
+void BrowserActionButton::OnMouseReleased(const views::MouseEvent& event,
                                           bool canceled) {
   if (IsPopup() || showing_context_menu_) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
-    MenuButton::OnMouseReleased(e, canceled);
+    MenuButton::OnMouseReleased(event, canceled);
   } else {
-    TextButton::OnMouseReleased(e, canceled);
+    TextButton::OnMouseReleased(event, canceled);
   }
 }
 
-bool BrowserActionButton::OnKeyReleased(const views::KeyEvent& e) {
+bool BrowserActionButton::OnKeyReleased(const views::KeyEvent& event) {
   return IsPopup() ?
-      MenuButton::OnKeyReleased(e) : TextButton::OnKeyReleased(e);
+      MenuButton::OnKeyReleased(event) : TextButton::OnKeyReleased(event);
 }
 
-void BrowserActionButton::OnMouseExited(const views::MouseEvent& e) {
+void BrowserActionButton::OnMouseExited(const views::MouseEvent& event) {
   if (IsPopup() || showing_context_menu_)
-    MenuButton::OnMouseExited(e);
+    MenuButton::OnMouseExited(event);
   else
-    TextButton::OnMouseExited(e);
+    TextButton::OnMouseExited(event);
 }
 
 void BrowserActionButton::ShowContextMenu(const gfx::Point& p,
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index e951ddb..d2e1853 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -75,31 +75,37 @@ class BrowserActionButton : public views::MenuButton,
   const SkBitmap& default_icon() const { return default_icon_; }
 
   // Overridden from views::View:
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View* parent,
+                                    View* child) OVERRIDE;
 
   // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   // Overridden from ImageLoadingTracker.
-  virtual void OnImageLoaded(
-      SkBitmap* image, const ExtensionResource& resource, int index);
+  virtual void OnImageLoaded(SkBitmap* image,
+                             const ExtensionResource& resource,
+                             int index) OVERRIDE;
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // MenuButton behavior overrides.  These methods all default to TextButton
   // behavior unless this button is a popup.  In that case, it uses MenuButton
   // behavior.  MenuButton has the notion of a child popup being shown where the
   // button will stay in the pushed state until the "menu" (a popup in this
   // case) is dismissed.
-  virtual bool Activate();
-  virtual bool OnMousePressed(const views::MouseEvent& e);
-  virtual void OnMouseReleased(const views::MouseEvent& e, bool canceled);
-  virtual bool OnKeyReleased(const views::KeyEvent& e);
-  virtual void OnMouseExited(const views::MouseEvent& event);
-  virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture);
+  virtual bool Activate() OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event,
+                               bool canceled) OVERRIDE;
+  virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE;
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
+  virtual void ShowContextMenu(const gfx::Point& p,
+                               bool is_mouse_gesture) OVERRIDE;
 
   // Does this button's action have a popup?
   virtual bool IsPopup();
diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc
index eaafa09..1c8de0f 100644
--- a/chrome/browser/ui/views/download_item_view.cc
+++ b/chrome/browser/ui/views/download_item_view.cc
@@ -891,12 +891,13 @@ bool DownloadItemView::OnMouseDragged(const views::MouseEvent& event) {
   return true;
 }
 
-bool DownloadItemView::OnKeyPressed(const views::KeyEvent& e) {
+bool DownloadItemView::OnKeyPressed(const views::KeyEvent& event) {
   // Key press should not activate us in dangerous mode.
   if (IsDangerousMode())
     return true;
 
-  if (e.key_code() == ui::VKEY_SPACE || e.key_code() == ui::VKEY_RETURN) {
+  if (event.key_code() == ui::VKEY_SPACE ||
+      event.key_code() == ui::VKEY_RETURN) {
     OpenDownload();
     return true;
   }
diff --git a/chrome/browser/ui/views/download_item_view.h b/chrome/browser/ui/views/download_item_view.h
index d244b66..97f2b2aa 100644
--- a/chrome/browser/ui/views/download_item_view.h
+++ b/chrome/browser/ui/views/download_item_view.h
@@ -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.
 //
@@ -76,7 +76,7 @@ class DownloadItemView : public views::ButtonListener,
   virtual void OnMouseReleased(const views::MouseEvent& event,
                                bool canceled) OVERRIDE;
   virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
-  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
+  virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE;
   virtual void ShowContextMenu(const gfx::Point& p,
                                bool is_mouse_gesture) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index de96fef..29cba84 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -969,14 +969,15 @@ std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
-bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
+bool LocationBarView::SkipDefaultKeyEventProcessing(
+    const views::KeyEvent& event) {
 #if defined(OS_WIN)
-  if (views::FocusManager::IsTabTraversalKeyEvent(e)) {
+  if (views::FocusManager::IsTabTraversalKeyEvent(event)) {
     if (HasValidSuggestText()) {
       // Return true so that the edit sees the tab and commits the suggestion.
       return true;
     }
-    if (keyword_hint_view_->IsVisible() && !e.IsShiftDown()) {
+    if (keyword_hint_view_->IsVisible() && !event.IsShiftDown()) {
       // Return true so the edit gets the tab event and enters keyword mode.
       return true;
     }
@@ -992,7 +993,7 @@ bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
       return true;
   }
 
-  return location_entry_->SkipDefaultKeyEventProcessing(e);
+  return location_entry_->SkipDefaultKeyEventProcessing(event);
 #else
   // This method is not used for Linux ports. See FocusManager::OnKeyEvent() in
   // src/views/focus/focus_manager.cc for details.
diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc
index 87a88b7..da60cd1 100644
--- a/chrome/browser/ui/views/reload_button.cc
+++ b/chrome/browser/ui/views/reload_button.cc
@@ -115,7 +115,7 @@ void ReloadButton::ButtonPressed(views::Button* /* button */,
 ////////////////////////////////////////////////////////////////////////////////
 // ReloadButton, View overrides:
 
-void ReloadButton::OnMouseExited(const views::MouseEvent& e) {
+void ReloadButton::OnMouseExited(const views::MouseEvent& event) {
   ChangeMode(intended_mode_, true);
   if (state() != BS_DISABLED)
     SetState(BS_NORMAL);
diff --git a/chrome/browser/ui/views/reload_button.h b/chrome/browser/ui/views/reload_button.h
index d83eeeb..3183673ed 100644
--- a/chrome/browser/ui/views/reload_button.h
+++ b/chrome/browser/ui/views/reload_button.h
@@ -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.
 
@@ -39,11 +39,12 @@ class ReloadButton : public views::ToggleImageButton,
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* /* button */,
-                             const views::Event& event);
+                             const views::Event& event) OVERRIDE;
 
   // Overridden from views::View:
-  virtual void OnMouseExited(const views::MouseEvent& e);
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p,
+                              std::wstring* tooltip) OVERRIDE;
 
  private:
   friend class ReloadButtonTest;
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index 4b0389f..3ee7e76 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -49,7 +49,7 @@ class TabCloseButton : public views::ImageButton {
   }
   virtual ~TabCloseButton() {}
 
-  virtual bool OnMousePressed(const views::MouseEvent& event) {
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
     bool handled = ImageButton::OnMousePressed(event);
     // Explicitly mark midle-mouse clicks as non-handled to ensure the tab
     // sees them.
@@ -59,12 +59,12 @@ class TabCloseButton : public views::ImageButton {
   // We need to let the parent know about mouse state so that it
   // can highlight itself appropriately. Note that Exit events
   // fire before Enter events, so this works.
-  virtual void OnMouseEntered(const views::MouseEvent& event) {
+  virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
     CustomButton::OnMouseEntered(event);
     parent()->OnMouseEntered(event);
   }
 
-  virtual void OnMouseExited(const views::MouseEvent& event) {
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE {
     CustomButton::OnMouseExited(event);
     parent()->OnMouseExited(event);
   }
@@ -268,7 +268,7 @@ bool BaseTab::IsCloseable() const {
   return controller() ? controller()->IsTabCloseable(this) : true;
 }
 
-void BaseTab::OnMouseEntered(const views::MouseEvent& e) {
+void BaseTab::OnMouseEntered(const views::MouseEvent& event) {
   if (!hover_animation_.get()) {
     hover_animation_.reset(new ui::SlideAnimation(this));
     hover_animation_->SetContainer(animation_container_.get());
@@ -278,7 +278,7 @@ void BaseTab::OnMouseEntered(const views::MouseEvent& e) {
   hover_animation_->Show();
 }
 
-void BaseTab::OnMouseExited(const views::MouseEvent& e) {
+void BaseTab::OnMouseExited(const views::MouseEvent& event) {
   hover_animation_->SetTweenType(ui::Tween::EASE_IN);
   hover_animation_->Hide();
 }
diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h
index c237bdb..9ed52d2 100644
--- a/chrome/browser/ui/views/tabs/base_tab.h
+++ b/chrome/browser/ui/views/tabs/base_tab.h
@@ -89,8 +89,8 @@ class BaseTab : public ui::AnimationDelegate,
   virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event,
                                bool canceled) OVERRIDE;
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
-      OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p,
+                              std::wstring* tooltip) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual ThemeProvider* GetThemeProvider() const OVERRIDE;
 
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 341e742..ad9937a9 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -350,8 +350,8 @@ bool Tab::GetTooltipTextOrigin(const gfx::Point& p, gfx::Point* origin) {
   return true;
 }
 
-void Tab::OnMouseMoved(const views::MouseEvent& e) {
-  hover_point_ = e.location();
+void Tab::OnMouseMoved(const views::MouseEvent& event) {
+  hover_point_ = event.location();
   // We need to redraw here because otherwise the hover glow does not update
   // and follow the new mouse position.
   SchedulePaint();