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

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

Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash" (Closed)
Patch Set: Created 3 years, 11 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/aura/wm_shell_aura.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // 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.
54 void HideShelfBehindBlackBar(bool hide, int animation_time_ms); 54 void HideShelfBehindBlackBar(bool hide, int animation_time_ms);
55 bool IsShelfHiddenBehindBlackBar() const; 55 bool IsShelfHiddenBehindBlackBar() const;
56 56
57 ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; } 57 ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
58 StatusAreaWidget* status_area_widget() const { return status_area_widget_; } 58 StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
59 59
60 ShelfView* CreateShelfView(); 60 ShelfView* CreateShelfView();
61 void PostCreateShelf(); 61 void PostCreateShelf();
62 62
63 // Set visibility of the shelf.
64 void SetShelfVisibility(bool visible);
63 bool IsShelfVisible() const; 65 bool IsShelfVisible() const;
64 66
65 bool IsShowingAppList() const; 67 bool IsShowingAppList() const;
66 bool IsShowingContextMenu() const; 68 bool IsShowingContextMenu() const;
67 bool IsShowingOverflowBubble() const; 69 bool IsShowingOverflowBubble() const;
68 70
69 // Sets the focus cycler. Also adds the shelf to the cycle. 71 // Sets the focus cycler. Also adds the shelf to the cycle.
70 void SetFocusCycler(FocusCycler* focus_cycler); 72 void SetFocusCycler(FocusCycler* focus_cycler);
71 FocusCycler* GetFocusCycler(); 73 FocusCycler* GetFocusCycler();
72 74
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ShelfView* shelf_view_; 119 ShelfView* shelf_view_;
118 ShelfBackgroundAnimator background_animator_; 120 ShelfBackgroundAnimator background_animator_;
119 bool activating_as_fallback_; 121 bool activating_as_fallback_;
120 122
121 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 123 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
122 }; 124 };
123 125
124 } // namespace ash 126 } // namespace ash
125 127
126 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_ 128 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698