| Index: chrome/browser/chromeos/input_method/candidate_window.cc
|
| diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
|
| index aacee58a0bef9876fd148ab63655b80c44291e76..0b14ffc02ae9a3fa695864a0474a3b2d38f77085 100644
|
| --- a/chrome/browser/chromeos/input_method/candidate_window.cc
|
| +++ b/chrome/browser/chromeos/input_method/candidate_window.cc
|
| @@ -527,17 +527,13 @@ class CandidateView : public views::View {
|
| // Returns the relative position of the candidate label.
|
| gfx::Point GetCandidateLabelPosition() const;
|
|
|
| - 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);
|
| + // Overridden from View:
|
| + 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:
|
| // Zero-origin index in the current page.
|
| int index_in_page_;
|
|
|
| @@ -735,12 +731,13 @@ bool CandidateView::OnMouseDragged(const views::MouseEvent& 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();
|
| }
|
|
|
|
|