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

Side by Side Diff: ash/shelf/shelf_view.h

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added PaletteTray to the Shelf background animations. Created 4 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
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_SHELF_SHELF_VIEW_H_ 5 #ifndef ASH_SHELF_SHELF_VIEW_H_
6 #define ASH_SHELF_SHELF_VIEW_H_ 6 #define ASH_SHELF_SHELF_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 void PointerPressedOnButton(views::View* view, 151 void PointerPressedOnButton(views::View* view,
152 Pointer pointer, 152 Pointer pointer,
153 const ui::LocatedEvent& event); 153 const ui::LocatedEvent& event);
154 void PointerDraggedOnButton(views::View* view, 154 void PointerDraggedOnButton(views::View* view,
155 Pointer pointer, 155 Pointer pointer,
156 const ui::LocatedEvent& event); 156 const ui::LocatedEvent& event);
157 void PointerReleasedOnButton(views::View* view, 157 void PointerReleasedOnButton(views::View* view,
158 Pointer pointer, 158 Pointer pointer,
159 bool canceled); 159 bool canceled);
160 160
161 // Updates all shelf item backgrounds.
162 void UpdateShelfItemBackground(int alpha);
163
161 // Return the view model for test purposes. 164 // Return the view model for test purposes.
162 const views::ViewModel* view_model_for_test() const { 165 const views::ViewModel* view_model_for_test() const {
163 return view_model_.get(); 166 return view_model_.get();
164 } 167 }
165 168
166 private: 169 private:
167 friend class ash::test::ShelfViewTestAPI; 170 friend class ash::test::ShelfViewTestAPI;
168 171
169 class FadeOutAnimationDelegate; 172 class FadeOutAnimationDelegate;
170 class StartFadeAnimationDelegate; 173 class StartFadeAnimationDelegate;
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 469
467 // Tracks UMA metrics based on shelf button press actions. 470 // Tracks UMA metrics based on shelf button press actions.
468 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 471 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
469 472
470 DISALLOW_COPY_AND_ASSIGN(ShelfView); 473 DISALLOW_COPY_AND_ASSIGN(ShelfView);
471 }; 474 };
472 475
473 } // namespace ash 476 } // namespace ash
474 477
475 #endif // ASH_SHELF_SHELF_VIEW_H_ 478 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698