diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-29 14:18:18 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-29 14:18:18 +0000 |
| commit | 16e7800dbfea61164a399d380c430d864de00d52 (patch) | |
| tree | 27c889b49ab784edbcb4a3b36b679622422efd4d /ash/wm | |
| parent | 7e1ef9df67fb204dd770572d604ae099e82fb676 (diff) | |
| download | chromium_src-16e7800dbfea61164a399d380c430d864de00d52.zip chromium_src-16e7800dbfea61164a399d380c430d864de00d52.tar.gz chromium_src-16e7800dbfea61164a399d380c430d864de00d52.tar.bz2 | |
Fix name collisions in WidgetDelegateView.
WidgetDelegate's HasHitTestMask and GetHitTestMask collides with View methods
that have the same name. Renaming them to WidgetHasHitTestMask and
GetWidgetHitTestMask.
BUG=none.
TEST=none.
R=stevenjb@chromium.org,sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10977085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/maximize_bubble_controller.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc index b26d903..a08c760 100644 --- a/ash/wm/maximize_bubble_controller.cc +++ b/ash/wm/maximize_bubble_controller.cc @@ -226,8 +226,8 @@ class MaximizeBubbleController::Bubble : public views::BubbleDelegateView, virtual bool CanActivate() const OVERRIDE { return false; } // Overridden from views::WidgetDelegateView. - virtual bool HasHitTestMask() const OVERRIDE; - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; + virtual bool WidgetHasHitTestMask() const OVERRIDE; + virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE; // Implementation of MouseWatcherListener. virtual void MouseMovedOutOfHost(); @@ -473,11 +473,12 @@ void MaximizeBubbleController::Bubble::AnimationProgressed( bubble_widget_->GetNativeWindow()->SetBounds(rect); } -bool MaximizeBubbleController::Bubble::HasHitTestMask() const { +bool MaximizeBubbleController::Bubble::WidgetHasHitTestMask() const { return bubble_border_ != NULL; } -void MaximizeBubbleController::Bubble::GetHitTestMask(gfx::Path* mask) const { +void MaximizeBubbleController::Bubble::GetWidgetHitTestMask( + gfx::Path* mask) const { DCHECK(mask); DCHECK(bubble_border_); bubble_border_->GetMask(mask); |