Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

chrome/browser/chromeos/input_method/candidate_window.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 "chrome/browser/chromeos/input_method/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 509 matching lines @@
   // like an unselected candidate.
   void Unselect();
 
   // Enables or disables the candidate row based on |enabled|. Changes the
   // appearance to make it look like unclickable area.
   void SetRowEnabled(bool enabled);
 
   // Returns the relative position of the candidate label.
   gfx::Point GetCandidateLabelPosition() const;
 
+  // Overridden from View:

[sadrul, 2011/03/19 09:15:30]

views::View

Why are these moved from private to public? I believe private overrides are
preferred unless public/protected is necessary. (here and other places)

[msw, 2011/03/26 00:09:50]

Done.

+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseCaptureLost() OVERRIDE;
+
  private:
-  // View::OnMousePressed() implementation.
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-
-  // View::OnMouseDragged() implementation.
-  virtual bool OnMouseDragged(const views::MouseEvent& event);
-
-  // View::OnMouseReleased() implementation.
-  virtual void OnMouseReleased(const views::MouseEvent& event,
-                               bool canceled);
-
   // Zero-origin index in the current page.
   int index_in_page_;
 
   // The orientation of the candidate view.
   InputMethodLookupTable::Orientation orientation_;
 
   // The parent candidate window that contains this view.
   CandidateWindowView* parent_candidate_window_;
 
   // Views created in the class will be part of tree of |this|, so these
@@ skipping 177 matching lines @@
 bool CandidateView::OnMouseDragged(const views::MouseEvent& event) {
   gfx::Point location_in_candidate_window = event.location();
   views::View::ConvertPointToView(this, parent_candidate_window_,
                                   &location_in_candidate_window);
   // Notify the candidate window that a candidate is now being dragged.
   parent_candidate_window_->OnCandidateDragged(location_in_candidate_window);
   // Request MouseReleased event.
   return true;
 }
 
-void CandidateView::OnMouseReleased(const views::MouseEvent& event,
-                                       bool canceled) {
-  // Commit the current candidate unless it's canceled.
-  if (!canceled) {
-    parent_candidate_window_->CommitCandidate();
-  }
+void CandidateView::OnMouseReleased(const views::MouseEvent& event) {
+  // Commit the current candidate.
+  parent_candidate_window_->CommitCandidate();
   parent_candidate_window_->OnMouseReleased();
 }
 
+void CandidateView::OnMouseCaptureLost() {
+  parent_candidate_window_->OnMouseReleased();
+}
+
 CandidateWindowView::CandidateWindowView(
     views::Widget* parent_frame)
     : selected_candidate_index_in_page_(0),
       parent_frame_(parent_frame),
       candidate_area_(NULL),
       footer_area_(NULL),
       header_area_(NULL),
       header_label_(NULL),
       footer_label_(NULL),
       previous_shortcut_column_width_(0),
@@ skipping 658 matching lines @@
 
 CandidateWindowController::~CandidateWindowController() {
   delete impl_;
 }
 
 bool CandidateWindowController::Init() {
   return impl_->Init();
 }
 
 }  // namespace chromeos