Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/button/image_button.cc

 // Copyright (c) 2010 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/button/image_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ skipping 46 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, View overrides:
 
 gfx::Size ImageButton::GetPreferredSize() {
   if (!images_[BS_NORMAL].isNull())
     return gfx::Size(images_[BS_NORMAL].width(), images_[BS_NORMAL].height());
   return preferred_size_;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// ImageButton, protected:
+
+SkBitmap ImageButton::GetImageToPaint() {
+  SkBitmap img;
+
+  if (!images_[BS_HOT].isNull() && hover_animation_->is_animating()) {
+    img = SkBitmapOperations::CreateBlendedBitmap(images_[BS_NORMAL],
+        images_[BS_HOT], hover_animation_->GetCurrentValue());
+  } else {
+    img = images_[state_];
+  }
+
+  return !img.isNull() ? img : images_[BS_NORMAL];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// ImageButton, View overrides, protected:
+
 void ImageButton::OnPaint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::OnPaint(canvas);
 
   SkBitmap img = GetImageToPaint();
 
   if (!img.isNull()) {
     int x = 0, y = 0;
 
     if (h_alignment_ == ALIGN_CENTER)
       x = (width() - img.width()) / 2;
     else if (h_alignment_ == ALIGN_RIGHT)
       x = width() - img.width();
 
     if (v_alignment_ == ALIGN_MIDDLE)
       y = (height() - img.height()) / 2;
     else if (v_alignment_ == ALIGN_BOTTOM)
       y = height() - img.height();
 
     if (!background_image_.empty())
       canvas->DrawBitmapInt(background_image_, x, y);
     canvas->DrawBitmapInt(img, x, y);
   }
   OnPaintFocusBorder(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImageButton, protected:
-
-SkBitmap ImageButton::GetImageToPaint() {
-  SkBitmap img;
-
-  if (!images_[BS_HOT].isNull() && hover_animation_->is_animating()) {
-    img = SkBitmapOperations::CreateBlendedBitmap(images_[BS_NORMAL],
-        images_[BS_HOT], hover_animation_->GetCurrentValue());
-  } else {
-    img = images_[state_];
-  }
-
-  return !img.isNull() ? img : images_[BS_NORMAL];
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, public:
 
 ToggleImageButton::ToggleImageButton(ButtonListener* listener)
     : ImageButton(listener),
       toggled_(false) {
 }
 
 ToggleImageButton::~ToggleImageButton() {
 }
 
@@ skipping 45 matching lines @@
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
                                        std::wstring* tooltip) {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
   *tooltip = UTF16ToWideHack(toggled_tooltip_text_);
   return true;
 }
 
 }  // namespace views