Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

-// 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.
 
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/content_setting_image_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ skipping 105 matching lines @@
   preferred_size.set_width(preferred_size.width() + visible_text_size_);
   return preferred_size;
 }
 
 bool ContentSettingImageView::OnMousePressed(const views::MouseEvent& event) {
   // We want to show the bubble on mouse release; that is the standard behavior
   // for buttons.
   return true;
 }
 
-void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event,
-                                              bool canceled) {
-  if (canceled || !HitTest(event.location()))
+void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
+  if (!HitTest(event.location()))
     return;
 
   TabContents* tab_contents = parent_->GetTabContentsWrapper()->tab_contents();
   if (!tab_contents)
     return;
 
   // Prerender does not have a bubble.
   ContentSettingsType content_settings_type =
       content_setting_image_model_->get_content_settings_type();
   if (content_settings_type == CONTENT_SETTINGS_TYPE_PRERENDER)
     return;
 
   gfx::Rect screen_bounds(GetImageBounds());
   gfx::Point origin(screen_bounds.origin());
   views::View::ConvertPointToScreen(this, &origin);
   screen_bounds.set_origin(origin);
   ContentSettingBubbleContents* bubble_contents =
       new ContentSettingBubbleContents(
           ContentSettingBubbleModel::CreateContentSettingBubbleModel(
               tab_contents, profile_, content_settings_type),
           profile_, tab_contents);
   info_bubble_ = InfoBubble::Show(GetWidget(), screen_bounds,
       BubbleBorder::TOP_RIGHT, bubble_contents, this);
   bubble_contents->set_info_bubble(info_bubble_);
 }
 
+void ContentSettingImageView::InfoBubbleClosing(InfoBubble* info_bubble,
+                                                bool closed_by_escape) {
+  info_bubble_ = NULL;
+}
+
+bool ContentSettingImageView::CloseOnEscape() {
+  return true;
+}
+
+bool ContentSettingImageView::FadeInOnShow() {
+  return false;
+}
+
 void ContentSettingImageView::VisibilityChanged(View* starting_from,
                                                 bool is_visible) {
   if (!is_visible && info_bubble_)
     info_bubble_->Close();
 }
 
 void ContentSettingImageView::OnPaint(gfx::Canvas* canvas) {
   gfx::Insets current_insets;
   if (border())
     border()->GetInsets(&current_insets);
@@ skipping 45 matching lines @@
                                         kBoxCornerRadius, paint);
   SkPaint outer_paint;
   outer_paint.setStyle(SkPaint::kStroke_Style);
   outer_paint.setColor(kBorderColor);
   color_rect.inset(SkIntToScalar(kEdgeThickness),
                    SkIntToScalar(kEdgeThickness));
   canvas->AsCanvasSkia()->drawRoundRect(color_rect, kBoxCornerRadius,
                                         kBoxCornerRadius, outer_paint);
 }
 
-void ContentSettingImageView::InfoBubbleClosing(InfoBubble* info_bubble,
-                                                bool closed_by_escape) {
-  info_bubble_ = NULL;
-}
-
-bool ContentSettingImageView::CloseOnEscape() {
-  return true;
-}
-
-bool ContentSettingImageView::FadeInOnShow() {
-  return false;
-}
-
 void ContentSettingImageView::AnimateToState(double state) {
   if (state >= 1.0) {
     // Animaton is over, clear the variables.
     animation_in_progress_ = false;
     visible_text_size_ = 0;
   } else if (state < kAnimatingFraction) {
     visible_text_size_ = static_cast<int>(text_size_ * state /
                                           kAnimatingFraction);
   } else if (state > (1.0 - kAnimatingFraction)) {
     visible_text_size_ = static_cast<int>(text_size_ * (1.0 - state) /
                                           kAnimatingFraction);
   } else {
     visible_text_size_ = text_size_;
   }
   parent_->Layout();
   parent_->SchedulePaint();
 }