| Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/content_setting_bubble_contents.cc (revision 151406)
|
| +++ chrome/browser/ui/views/content_setting_bubble_contents.cc (working copy)
|
| @@ -52,9 +52,9 @@
|
|
|
| private:
|
| // views::View overrides:
|
| - virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
| - virtual gfx::NativeCursor GetCursor(const views::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE;
|
|
|
| ContentSettingBubbleContents* parent_;
|
| views::Link* link_;
|
| @@ -73,12 +73,12 @@
|
| }
|
|
|
| bool ContentSettingBubbleContents::Favicon::OnMousePressed(
|
| - const views::MouseEvent& event) {
|
| + const ui::MouseEvent& event) {
|
| return event.IsLeftMouseButton() || event.IsMiddleMouseButton();
|
| }
|
|
|
| void ContentSettingBubbleContents::Favicon::OnMouseReleased(
|
| - const views::MouseEvent& event) {
|
| + const ui::MouseEvent& event) {
|
| if ((event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
|
| HitTestPoint(event.location())) {
|
| parent_->LinkClicked(link_, event.flags());
|
| @@ -86,7 +86,7 @@
|
| }
|
|
|
| gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursor(
|
| - const views::MouseEvent& event) {
|
| + const ui::MouseEvent& event) {
|
| #if defined(USE_AURA)
|
| return ui::kCursorHand;
|
| #elif defined(OS_WIN)
|
|
|