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

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

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Address comments. Created 4 years, 2 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/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_widget.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_COMMON_SHELF_SHELF_WIDGET_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_
6 #define ASH_COMMON_SHELF_SHELF_WIDGET_H_ 6 #define ASH_COMMON_SHELF_SHELF_WIDGET_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 21 matching lines...) Expand all
32 class ASH_EXPORT ShelfWidget : public views::Widget, 32 class ASH_EXPORT ShelfWidget : public views::Widget,
33 public views::WidgetObserver, 33 public views::WidgetObserver,
34 public ShelfBackgroundAnimatorObserver, 34 public ShelfBackgroundAnimatorObserver,
35 public ShelfLayoutManagerObserver { 35 public ShelfLayoutManagerObserver {
36 public: 36 public:
37 ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf); 37 ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf);
38 ~ShelfWidget() override; 38 ~ShelfWidget() override;
39 39
40 void CreateStatusAreaWidget(WmWindow* status_container); 40 void CreateStatusAreaWidget(WmWindow* status_container);
41 41
42 // Returns if shelf alignment option is enabled, and the user is able to
43 // adjust the alignment (guest and supervised mode users cannot for example).
44 static bool ShelfAlignmentAllowed();
45
46 void OnShelfAlignmentChanged(); 42 void OnShelfAlignmentChanged();
47 43
48 // DEPRECATED: Prefer WmShelf::GetAlignment(). 44 // DEPRECATED: Prefer WmShelf::GetAlignment().
49 ShelfAlignment GetAlignment() const; 45 ShelfAlignment GetAlignment() const;
50 46
51 // Sets the shelf's background type. 47 // Sets the shelf's background type.
52 void SetPaintsBackground(ShelfBackgroundType background_type, 48 void SetPaintsBackground(ShelfBackgroundType background_type,
53 BackgroundAnimatorChangeType change_type); 49 BackgroundAnimatorChangeType change_type);
54 ShelfBackgroundType GetBackgroundType() const; 50 ShelfBackgroundType GetBackgroundType() const;
55 51
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 ShelfView* shelf_view_; 137 ShelfView* shelf_view_;
142 ShelfBackgroundAnimator background_animator_; 138 ShelfBackgroundAnimator background_animator_;
143 bool activating_as_fallback_; 139 bool activating_as_fallback_;
144 140
145 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 141 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
146 }; 142 };
147 143
148 } // namespace ash 144 } // namespace ash
149 145
150 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_ 146 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698