Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

chrome/browser/ui/views/location_bar/location_bar_view.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/ui/views/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 723 matching lines @@
   }
   OnMouseEvent(event, msg);
   return true;
 }
 
 bool LocationBarView::OnMouseDragged(const views::MouseEvent& event) {
   OnMouseEvent(event, WM_MOUSEMOVE);
   return true;
 }
 
-void LocationBarView::OnMouseReleased(const views::MouseEvent& event,
-                                      bool canceled) {
+void LocationBarView::OnMouseReleased(const views::MouseEvent& event) {
   UINT msg;
-  if (canceled) {
-    msg = WM_CAPTURECHANGED;
-  } else if (event.IsLeftMouseButton()) {
+  if (event.IsLeftMouseButton()) {
     msg = WM_LBUTTONUP;
   } else if (event.IsMiddleMouseButton()) {
     msg = WM_MBUTTONUP;
   } else if (event.IsRightMouseButton()) {
     msg = WM_RBUTTONUP;
   } else {
     NOTREACHED();
     return;
   }
   OnMouseEvent(event, msg);
 }
+
+void LocationBarView::OnMouseCaptureLost() {
+  location_entry_->HandleExternalMsg(WM_CAPTURECHANGED, 0, CPoint());
+}
 #endif
 
 void LocationBarView::OnAutocompleteAccept(
     const GURL& url,
     WindowOpenDisposition disposition,
     PageTransition::Type transition,
     const GURL& alternate_nav_url) {
   // WARNING: don't add an early return here. The calls after the if must
   // happen.
   if (url.is_valid()) {
@@ skipping 168 matching lines @@
             NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
             Source<ExtensionAction>(action),
             Details<TabContents>(contents));
       }
     }
   }
 }
 
 #if defined(OS_WIN)
 void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) {
-  UINT flags = 0;
-  if (event.IsControlDown())
-    flags |= MK_CONTROL;
-  if (event.IsShiftDown())
-    flags |= MK_SHIFT;
-  if (event.IsLeftMouseButton())
-    flags |= MK_LBUTTON;
-  if (event.IsMiddleMouseButton())
-    flags |= MK_MBUTTON;
-  if (event.IsRightMouseButton())
-    flags |= MK_RBUTTON;
-
+  UINT flags = event.GetWindowsFlags();
   gfx::Point screen_point(event.location());
   ConvertPointToScreen(this, &screen_point);
   location_entry_->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
 }
 #endif
 
 void LocationBarView::ShowFirstRunBubbleInternal(
     FirstRun::BubbleType bubble_type) {
 #if defined(OS_WIN)  // First run bubble doesn't make sense for Chrome OS.
   // If the browser is no longer active, let's not show the info bubble, as this
@@ skipping 221 matching lines @@
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 #endif