Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: ash/launcher/launcher_view.h

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_ 5 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_
6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_ 6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // first button to include the leading inset. It needs to be called once on 177 // first button to include the leading inset. It needs to be called once on
178 // button creation and every time when shelf alignment is changed. 178 // button creation and every time when shelf alignment is changed.
179 void UpdateFirstButtonPadding(); 179 void UpdateFirstButtonPadding();
180 180
181 // Overridden from views::View: 181 // Overridden from views::View:
182 virtual gfx::Size GetPreferredSize() OVERRIDE; 182 virtual gfx::Size GetPreferredSize() OVERRIDE;
183 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 183 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
184 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; 184 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
185 185
186 // Overridden from ui::EventHandler: 186 // Overridden from ui::EventHandler:
187 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 187 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
188 188
189 // Overridden from LauncherModelObserver: 189 // Overridden from LauncherModelObserver:
190 virtual void LauncherItemAdded(int model_index) OVERRIDE; 190 virtual void LauncherItemAdded(int model_index) OVERRIDE;
191 virtual void LauncherItemRemoved(int model_index, LauncherID id) OVERRIDE; 191 virtual void LauncherItemRemoved(int model_index, LauncherID id) OVERRIDE;
192 virtual void LauncherItemChanged(int model_index, 192 virtual void LauncherItemChanged(int model_index,
193 const ash::LauncherItem& old_item) OVERRIDE; 193 const ash::LauncherItem& old_item) OVERRIDE;
194 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE; 194 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE;
195 virtual void LauncherStatusChanged() OVERRIDE; 195 virtual void LauncherStatusChanged() OVERRIDE;
196 196
197 // Overridden from LauncherButtonHost: 197 // Overridden from LauncherButtonHost:
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 ShelfGestureHandler gesture_handler_; 286 ShelfGestureHandler gesture_handler_;
287 287
288 DISALLOW_COPY_AND_ASSIGN(LauncherView); 288 DISALLOW_COPY_AND_ASSIGN(LauncherView);
289 }; 289 };
290 290
291 } // namespace internal 291 } // namespace internal
292 } // namespace ash 292 } // namespace ash
293 293
294 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_ 294 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698