| Index: ash/launcher/launcher_view.h
|
| diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
|
| index 2749949ac5d5772a9fe740cea249e510d222ea2d..2b3378c6bd0b1ac7823430487ce36eb9a2cc77ba 100644
|
| --- a/ash/launcher/launcher_view.h
|
| +++ b/ash/launcher/launcher_view.h
|
| @@ -174,7 +174,7 @@ class ASH_EXPORT LauncherView : public views::View,
|
|
|
| // Overridden from views::View:
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| const ui::GestureEvent& event) OVERRIDE;
|
| virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
|
| virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
|
|
|