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 /ui/app_list | |
| 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 'ui/app_list')
| -rw-r--r-- | ui/app_list/app_list_view.cc | 4 | ||||
| -rw-r--r-- | ui/app_list/app_list_view.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/app_list/app_list_view.cc b/ui/app_list/app_list_view.cc index 13dc39a..97e4a99 100644 --- a/ui/app_list/app_list_view.cc +++ b/ui/app_list/app_list_view.cc @@ -143,11 +143,11 @@ views::View* AppListView::GetInitiallyFocusedView() { return search_box_view_->search_box(); } -bool AppListView::HasHitTestMask() const { +bool AppListView::WidgetHasHitTestMask() const { return true; } -void AppListView::GetHitTestMask(gfx::Path* mask) const { +void AppListView::GetWidgetHitTestMask(gfx::Path* mask) const { DCHECK(mask); mask->addRect(gfx::RectToSkRect( GetBubbleFrameView()->GetContentsBounds())); diff --git a/ui/app_list/app_list_view.h b/ui/app_list/app_list_view.h index 68a73c8..89fb1f7 100644 --- a/ui/app_list/app_list_view.h +++ b/ui/app_list/app_list_view.h @@ -53,8 +53,8 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView, // Overridden from views::WidgetDelegateView: virtual views::View* GetInitiallyFocusedView() OVERRIDE; - 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; // Overridden from views::View: virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; |