summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_button.h
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-21 06:02:01 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-21 06:02:01 +0000
commitecb008ca0634af3c14c0a87767d2a1b647825d3c (patch)
treed5136158196407bf8bb8daa5c8411c2ae23055af /ash/launcher/launcher_button.h
parent8a4c1d1a34b9a89a222e49eeec8e437f390e9ee2 (diff)
downloadchromium_src-ecb008ca0634af3c14c0a87767d2a1b647825d3c.zip
chromium_src-ecb008ca0634af3c14c0a87767d2a1b647825d3c.tar.gz
chromium_src-ecb008ca0634af3c14c0a87767d2a1b647825d3c.tar.bz2
ash: Support touch drag in launcher.
This CL uses ET_GESTURE_SCROLL_BEGIN etc on launcher button for touch drag. BUG=113400 TEST=Verify can drag app shortcut around using touch. Review URL: https://chromiumcodereview.appspot.com/10807017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_button.h')
-rw-r--r--ash/launcher/launcher_button.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h
index 29a1c2a..16ba0d7 100644
--- a/ash/launcher/launcher_button.h
+++ b/ash/launcher/launcher_button.h
@@ -89,6 +89,8 @@ class LauncherButton : public views::CustomButton {
virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
+ virtual ui::GestureStatus OnGestureEvent(
+ const views::GestureEvent& event) OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
virtual void Layout() OVERRIDE;
virtual void OnFocus() OVERRIDE;