Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
@@ skipping 31 matching lines @@
 // narrow bubbles with lots of line-wrapping.
 const int kMinMultiLineContentsWidth = 250;
 
 class ContentSettingBubbleContents::Favicon : public views::ImageView {
  public:
   Favicon(const SkBitmap& image,
           ContentSettingBubbleContents* parent,
           views::Link* link);
   virtual ~Favicon();
 
+  // views::View overrides:
+  virtual gfx::NativeCursor GetCursorForPoint(ui::EventType event_type,
+                                              const gfx::Point& p) OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;

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

Why are these moved from private to public?

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

Done.

+
  private:
 #if defined(OS_WIN)
   static HCURSOR g_hand_cursor;
 #endif
 
-  // views::View overrides:
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
-  virtual gfx::NativeCursor GetCursorForPoint(ui::EventType event_type,
-                                              const gfx::Point& p);
-
   ContentSettingBubbleContents* parent_;
   views::Link* link_;
 };
 
 #if defined(OS_WIN)
 HCURSOR ContentSettingBubbleContents::Favicon::g_hand_cursor = NULL;
 #endif
 
 ContentSettingBubbleContents::Favicon::Favicon(
     const SkBitmap& image,
     ContentSettingBubbleContents* parent,
     views::Link* link)
     : parent_(parent),
       link_(link) {
   SetImage(image);
 }
 
 ContentSettingBubbleContents::Favicon::~Favicon() {
 }
 
-bool ContentSettingBubbleContents::Favicon::OnMousePressed(
-    const views::MouseEvent& event) {
-  return event.IsLeftMouseButton() || event.IsMiddleMouseButton();
-}
-
-void ContentSettingBubbleContents::Favicon::OnMouseReleased(
-    const views::MouseEvent& event,
-    bool canceled) {
-  if (!canceled &&
-      (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
-      HitTest(event.location()))
-    parent_->LinkActivated(link_, event.flags());
-}
-
 gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursorForPoint(
     ui::EventType event_type,
     const gfx::Point& p) {
 #if defined(OS_WIN)
   if (!g_hand_cursor)
     g_hand_cursor = LoadCursor(NULL, IDC_HAND);
   return g_hand_cursor;
 #elif defined(OS_LINUX)
   return gfx::GetCursor(GDK_HAND2);
 #endif
 }
 
+bool ContentSettingBubbleContents::Favicon::OnMousePressed(
+    const views::MouseEvent& event) {
+  return event.IsLeftMouseButton() || event.IsMiddleMouseButton();
+}
+
+void ContentSettingBubbleContents::Favicon::OnMouseReleased(
+    const views::MouseEvent& event) {
+  if ((event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
+      HitTest(event.location()))

[Ben Goodger (Google), 2011/03/19 15:32:55]

braces around this block

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

Done.

+    parent_->LinkActivated(link_, event.flags());
+}
+
 ContentSettingBubbleContents::ContentSettingBubbleContents(
     ContentSettingBubbleModel* content_setting_bubble_model,
     Profile* profile,
     TabContents* tab_contents)
     : content_setting_bubble_model_(content_setting_bubble_model),
       profile_(profile),
       tab_contents_(tab_contents),
       info_bubble_(NULL),
       custom_link_(NULL),
       manage_link_(NULL),
@@ skipping 216 matching lines @@
   layout->StartRow(0, double_column_set_id);
   manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link));
   manage_link_->SetController(this);
   layout->AddView(manage_link_);
 
   close_button_ =
       new views::NativeButton(this,
                               UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE)));
   layout->AddView(close_button_);
 }