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

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

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_H_ 5 #ifndef ASH_SHELF_SHELF_H_
6 #define ASH_SHELF_SHELF_H_ 6 #define ASH_SHELF_SHELF_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 19 matching lines...) Expand all
30 class Rect; 30 class Rect;
31 } 31 }
32 32
33 namespace views { 33 namespace views {
34 class View; 34 class View;
35 } 35 }
36 36
37 namespace ash { 37 namespace ash {
38 class AppListButton; 38 class AppListButton;
39 class FocusCycler; 39 class FocusCycler;
40 class ShelfBackgroundAnimator;
40 class ShelfDelegate; 41 class ShelfDelegate;
41 class ShelfIconObserver; 42 class ShelfIconObserver;
42 class ShelfModel; 43 class ShelfModel;
43 class ShelfView; 44 class ShelfView;
44 class WmShelf; 45 class WmShelf;
45 46
46 namespace test { 47 namespace test {
47 class ShelfTestAPI; 48 class ShelfTestAPI;
48 } 49 }
49 50
50 // Controller for shelf state. All access to state (visibility, auto-hide, etc.) 51 // Controller for shelf state. All access to state (visibility, auto-hide, etc.)
51 // should occur via this class. 52 // should occur via this class.
52 class ASH_EXPORT Shelf { 53 class ASH_EXPORT Shelf {
53 public: 54 public:
54 static const char kNativeViewName[]; 55 static const char kNativeViewName[];
55 56
56 Shelf(ShelfModel* model, 57 Shelf(ShelfModel* model,
57 WmShelf* wm_shelf, 58 WmShelf* wm_shelf,
58 ShelfWidget* widget); 59 ShelfWidget* widget,
59 virtual ~Shelf(); 60 ShelfBackgroundAnimator* background_animator);
61 ~Shelf();
60 62
61 // Return the shelf for the primary display. NULL if no user is logged in yet. 63 // Return the shelf for the primary display. NULL if no user is logged in yet.
62 // Useful for tests. For production code use ForWindow() because the user may 64 // Useful for tests. For production code use ForWindow() because the user may
63 // have multiple displays. 65 // have multiple displays.
64 static Shelf* ForPrimaryDisplay(); 66 static Shelf* ForPrimaryDisplay();
65 67
66 // Return the shelf for the display that |window| is currently on, or a shelf 68 // Return the shelf for the display that |window| is currently on, or a shelf
67 // on primary display if the shelf per display feature is disabled. NULL if no 69 // on primary display if the shelf per display feature is disabled. NULL if no
68 // user is logged in yet. 70 // user is logged in yet.
69 static Shelf* ForWindow(const aura::Window* window); 71 static Shelf* ForWindow(const aura::Window* window);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 171
170 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM; 172 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
171 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; 173 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
172 174
173 DISALLOW_COPY_AND_ASSIGN(Shelf); 175 DISALLOW_COPY_AND_ASSIGN(Shelf);
174 }; 176 };
175 177
176 } // namespace ash 178 } // namespace ash
177 179
178 #endif // ASH_SHELF_SHELF_H_ 180 #endif // ASH_SHELF_SHELF_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698