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

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

Issue 10827420: Revert 152221 - chromeos: Sync animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months 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_types.h ('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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 virtual gfx::Size GetPreferredSize() OVERRIDE; 175 virtual gfx::Size GetPreferredSize() OVERRIDE;
176 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 176 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
177 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; 177 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
178 178
179 // Overridden from LauncherModelObserver: 179 // Overridden from LauncherModelObserver:
180 virtual void LauncherItemAdded(int model_index) OVERRIDE; 180 virtual void LauncherItemAdded(int model_index) OVERRIDE;
181 virtual void LauncherItemRemoved(int model_index, LauncherID id) OVERRIDE; 181 virtual void LauncherItemRemoved(int model_index, LauncherID id) OVERRIDE;
182 virtual void LauncherItemChanged(int model_index, 182 virtual void LauncherItemChanged(int model_index,
183 const ash::LauncherItem& old_item) OVERRIDE; 183 const ash::LauncherItem& old_item) OVERRIDE;
184 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE; 184 virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE;
185 virtual void LauncherStatusChanged() OVERRIDE;
186 185
187 // Overridden from LauncherButtonHost: 186 // Overridden from LauncherButtonHost:
188 virtual void PointerPressedOnButton( 187 virtual void PointerPressedOnButton(
189 views::View* view, 188 views::View* view,
190 Pointer pointer, 189 Pointer pointer,
191 const ui::LocatedEvent& event) OVERRIDE; 190 const ui::LocatedEvent& event) OVERRIDE;
192 virtual void PointerDraggedOnButton( 191 virtual void PointerDraggedOnButton(
193 views::View* view, 192 views::View* view,
194 Pointer pointer, 193 Pointer pointer,
195 const ui::LocatedEvent& event) OVERRIDE; 194 const ui::LocatedEvent& event) OVERRIDE;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 // alignment). 272 // alignment).
274 int leading_inset_; 273 int leading_inset_;
275 274
276 DISALLOW_COPY_AND_ASSIGN(LauncherView); 275 DISALLOW_COPY_AND_ASSIGN(LauncherView);
277 }; 276 };
278 277
279 } // namespace internal 278 } // namespace internal
280 } // namespace ash 279 } // namespace ash
281 280
282 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_ 281 #endif // ASH_LAUNCHER_LAUNCHER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_types.h ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698