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

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

Issue 1851883002: Cleanup shelf initialization and observation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check for shelf before setting prefs in ChromeLauncherController. Created 4 years, 8 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_WIDGET_H_ 5 #ifndef ASH_SHELF_SHELF_WIDGET_H_
6 #define ASH_SHELF_SHELF_WIDGET_H_ 6 #define ASH_SHELF_SHELF_WIDGET_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/background_animator.h" 9 #include "ash/shelf/background_animator.h"
10 #include "ash/shelf/shelf_layout_manager_observer.h" 10 #include "ash/shelf/shelf_layout_manager_observer.h"
(...skipping 14 matching lines...) Expand all
25 25
26 class ASH_EXPORT ShelfWidget : public views::Widget, 26 class ASH_EXPORT ShelfWidget : public views::Widget,
27 public views::WidgetObserver, 27 public views::WidgetObserver,
28 public ShelfLayoutManagerObserver { 28 public ShelfLayoutManagerObserver {
29 public: 29 public:
30 ShelfWidget(aura::Window* shelf_container, 30 ShelfWidget(aura::Window* shelf_container,
31 aura::Window* status_container, 31 aura::Window* status_container,
32 WorkspaceController* workspace_controller); 32 WorkspaceController* workspace_controller);
33 ~ShelfWidget() override; 33 ~ShelfWidget() override;
34 34
35 // Returns if shelf alignment option is enabled, and the user is able 35 // Returns if shelf alignment option is enabled, and the user is able to
36 // to adjust the alignment (guest and supervised mode users cannot for 36 // adjust the alignment (guest and supervised mode users cannot for example).
37 // example).
38 static bool ShelfAlignmentAllowed(); 37 static bool ShelfAlignmentAllowed();
39 38
40 void SetAlignment(ShelfAlignment alignmnet); 39 void OnShelfAlignmentChanged();
41 ShelfAlignment GetAlignment() const; 40 ShelfAlignment GetAlignment() const;
42 41
43 // Sets the shelf's background type. 42 // Sets the shelf's background type.
44 void SetPaintsBackground(ShelfBackgroundType background_type, 43 void SetPaintsBackground(ShelfBackgroundType background_type,
45 BackgroundAnimatorChangeType change_type); 44 BackgroundAnimatorChangeType change_type);
46 ShelfBackgroundType GetBackgroundType() const; 45 ShelfBackgroundType GetBackgroundType() const;
47 46
48 // Hide the shelf behind a black bar during e.g. a user transition when |hide| 47 // Hide the shelf behind a black bar during e.g. a user transition when |hide|
49 // is true. The |animation_time_ms| will be used as animation duration. 48 // is true. The |animation_time_ms| will be used as animation duration.
50 void HideShelfBehindBlackBar(bool hide, int animation_time_ms); 49 void HideShelfBehindBlackBar(bool hide, int animation_time_ms);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // during CloseChildWindows of the associated RootWindowController. 107 // during CloseChildWindows of the associated RootWindowController.
109 DelegateView* delegate_view_; 108 DelegateView* delegate_view_;
110 BackgroundAnimator background_animator_; 109 BackgroundAnimator background_animator_;
111 bool activating_as_fallback_; 110 bool activating_as_fallback_;
112 aura::Window* window_container_; 111 aura::Window* window_container_;
113 }; 112 };
114 113
115 } // namespace ash 114 } // namespace ash
116 115
117 #endif // ASH_SHELF_SHELF_WIDGET_H_ 116 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698