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

Unified Diff: ash/common/shelf/shelf_widget.h

Issue 2628933003: Revert of Reland: 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index 7225ccedaf08850275af592ab04d8e77003a7762..688a1c7898903566677105811b32ace0a3458195 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -29,9 +29,6 @@
class WmShelf;
class WmWindow;
-// The ShelfWidget manages the shelf view (which contains the shelf icons) and
-// the status area widget. There is one ShelfWidget per display. It is created
-// early during RootWindowController initialization.
class ASH_EXPORT ShelfWidget : public views::Widget,
public views::WidgetObserver,
public ShelfBackgroundAnimatorObserver,
@@ -60,11 +57,11 @@
ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
- // Creates the shelf view and populates it with icons. Called after the user
- // session is active (and hence the user profile is available).
ShelfView* CreateShelfView();
void PostCreateShelf();
+ // Set visibility of the shelf.
+ void SetShelfVisibility(bool visible);
bool IsShelfVisible() const;
bool IsShowingAppList() const;
@@ -118,8 +115,7 @@
// |delegate_view_| is the contents view of this widget and is cleaned up
// during CloseChildWindows of the associated RootWindowController.
DelegateView* delegate_view_;
- // View containing the shelf items. Owned by the views hierarchy. Null when
- // at the login screen.
+ // View containing the shelf items. Owned by the views hierarchy.
ShelfView* shelf_view_;
ShelfBackgroundAnimator background_animator_;
bool activating_as_fallback_;
« 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