diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 19:29:04 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 19:29:04 +0000 |
| commit | 0fe4c7993506c5c459949a6deabd6c62d39661ce (patch) | |
| tree | a8d4fb52754a263e84702814c29403732397206f /ash/launcher | |
| parent | 1e3b940afe9fd1bd278185caa11cff77f86a65c5 (diff) | |
| download | chromium_src-0fe4c7993506c5c459949a6deabd6c62d39661ce.zip chromium_src-0fe4c7993506c5c459949a6deabd6c62d39661ce.tar.gz chromium_src-0fe4c7993506c5c459949a6deabd6c62d39661ce.tar.bz2 | |
Replace views::Event with ui::Event.
http://crbug.com/125937
TBR=sky@chromium.org,jochen@chromium.org,sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10827271
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_view.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 9ce72b2..7334eed 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -988,7 +988,7 @@ string16 LauncherView::GetAccessibleName(const views::View* view) { } void LauncherView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { // Do not handle mouse release during drag. if (dragging()) return; diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h index 3978142..74e2ff2 100644 --- a/ash/launcher/launcher_view.h +++ b/ash/launcher/launcher_view.h @@ -203,7 +203,7 @@ class ASH_EXPORT LauncherView : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, |