| Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
|
| diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
|
| index 8c2a381501d36cf4c08358b5119c242a91144b4c..a4031e565f9b0ac06e5d43350884b8972255b8eb 100644
|
| --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
|
| +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
|
| @@ -55,10 +55,10 @@ class ContentSettingBubbleContents::Favicon : public views::ImageView {
|
| #endif
|
|
|
| // views::View overrides:
|
| - virtual bool OnMousePressed(const views::MouseEvent& event);
|
| - virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
|
| + virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
| virtual gfx::NativeCursor GetCursorForPoint(ui::EventType event_type,
|
| - const gfx::Point& p);
|
| + const gfx::Point& p) OVERRIDE;
|
|
|
| ContentSettingBubbleContents* parent_;
|
| views::Link* link_;
|
| @@ -86,12 +86,11 @@ bool ContentSettingBubbleContents::Favicon::OnMousePressed(
|
| }
|
|
|
| void ContentSettingBubbleContents::Favicon::OnMouseReleased(
|
| - const views::MouseEvent& event,
|
| - bool canceled) {
|
| - if (!canceled &&
|
| - (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
|
| - HitTest(event.location()))
|
| + const views::MouseEvent& event) {
|
| + if ((event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
|
| + HitTest(event.location())) {
|
| parent_->LinkActivated(link_, event.flags());
|
| + }
|
| }
|
|
|
| gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursorForPoint(
|
|
|