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

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

Issue 2676673005: ash: Clean up shelf GetAlignment() and IsHorizontalAlignment() calls (Closed)
Patch Set: Created 3 years, 10 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 26 matching lines...) Expand all
37 public ShelfBackgroundAnimatorObserver, 37 public ShelfBackgroundAnimatorObserver,
38 public ShelfLayoutManagerObserver { 38 public ShelfLayoutManagerObserver {
39 public: 39 public:
40 ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf); 40 ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf);
41 ~ShelfWidget() override; 41 ~ShelfWidget() override;
42 42
43 void CreateStatusAreaWidget(WmWindow* status_container); 43 void CreateStatusAreaWidget(WmWindow* status_container);
44 44
45 void OnShelfAlignmentChanged(); 45 void OnShelfAlignmentChanged();
46 46
47 // DEPRECATED: Prefer WmShelf::GetAlignment().
48 ShelfAlignment GetAlignment() const;
49
50 // Sets the shelf's background type. 47 // Sets the shelf's background type.
51 void SetPaintsBackground(ShelfBackgroundType background_type, 48 void SetPaintsBackground(ShelfBackgroundType background_type,
52 BackgroundAnimatorChangeType change_type); 49 BackgroundAnimatorChangeType change_type);
53 ShelfBackgroundType GetBackgroundType() const; 50 ShelfBackgroundType GetBackgroundType() const;
54 51
55 // Hide the shelf behind a black bar during e.g. a user transition when |hide| 52 // Hide the shelf behind a black bar during e.g. a user transition when |hide|
56 // is true. The |animation_time_ms| will be used as animation duration. 53 // is true. The |animation_time_ms| will be used as animation duration.
57 void HideShelfBehindBlackBar(bool hide, int animation_time_ms); 54 void HideShelfBehindBlackBar(bool hide, int animation_time_ms);
58 bool IsShelfHiddenBehindBlackBar() const; 55 bool IsShelfHiddenBehindBlackBar() const;
59 56
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ShelfView* shelf_view_; 120 ShelfView* shelf_view_;
124 ShelfBackgroundAnimator background_animator_; 121 ShelfBackgroundAnimator background_animator_;
125 bool activating_as_fallback_; 122 bool activating_as_fallback_;
126 123
127 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 124 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
128 }; 125 };
129 126
130 } // namespace ash 127 } // namespace ash
131 128
132 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_ 129 #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