Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/textfield/native_textfield_views.cc

 // 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.
 
 #include "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
 
   SetContextMenuController(this);
 }
 
 NativeTextfieldViews::~NativeTextfieldViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, View overrides:
 
-bool NativeTextfieldViews::OnMousePressed(const views::MouseEvent& e) {
+bool NativeTextfieldViews::OnMousePressed(const views::MouseEvent& event) {
   OnBeforeUserAction();
-  if (HandleMousePressed(e))
+  if (HandleMousePressed(event))
     SchedulePaint();
   OnAfterUserAction();
   return true;
 }
 
-bool NativeTextfieldViews::OnMouseDragged(const views::MouseEvent& e) {
+bool NativeTextfieldViews::OnMouseDragged(const views::MouseEvent& event) {
   OnBeforeUserAction();
-  size_t pos = FindCursorPosition(e.location());
+  size_t pos = FindCursorPosition(event.location());
   if (model_->MoveCursorTo(pos, true)) {
     UpdateCursorBoundsAndTextOffset();
     SchedulePaint();
   }
   OnAfterUserAction();
   return true;
 }
 
-void NativeTextfieldViews::OnMouseReleased(const views::MouseEvent& e,
-                                          bool canceled) {
-}
-
-bool NativeTextfieldViews::OnKeyPressed(const views::KeyEvent& e) {
+bool NativeTextfieldViews::OnKeyPressed(const views::KeyEvent& event) {
   // OnKeyPressed/OnKeyReleased/OnFocus/OnBlur will never be invoked on
   // NativeTextfieldViews as it will never gain focus.
   NOTREACHED();
   return false;
 }
 
-bool NativeTextfieldViews::OnKeyReleased(const views::KeyEvent& e) {
+bool NativeTextfieldViews::OnKeyReleased(const views::KeyEvent& event) {
   NOTREACHED();
   return false;
 }
 
 void NativeTextfieldViews::OnPaint(gfx::Canvas* canvas) {
   text_border_->set_has_focus(textfield_->HasFocus());
   OnPaintBackground(canvas);
   PaintTextAndCursor(canvas);
   if (textfield_->draw_border())
     OnPaintBorder(canvas);
@@ skipping 331 matching lines @@
 
   if (full_width < width) {
     // Show all text whenever the text fits to the size.
     text_offset_ = 0;
   } else if (x_right > width) {
     // when the cursor overflows to the right
     text_offset_ = width - cursor_bounds_.right();
   } else if (x_left < 0) {
     // when the cursor overflows to the left
     text_offset_ = -cursor_bounds_.x();
-  } else if(full_width > width && text_offset_ + full_width < width) {
+  } else if (full_width > width && text_offset_ + full_width < width) {
     // when the cursor moves within the textfield with the text
     // longer than the field.
     text_offset_ = width - full_width;
   } else {
     // move cursor freely.
   }
   // shift cursor bounds to fit insets.
   cursor_bounds_.set_x(cursor_bounds_.x() + text_offset_ + insets.left());
 }
 
@@ skipping 341 matching lines @@
 }
 
 void NativeTextfieldViews::TextfieldBorder::SetInsets(int top,
                                                       int left,
                                                       int bottom,
                                                       int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 }  // namespace views