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

Unified Diff: ash/mus/bridge/wm_shelf_mus.h

Issue 2230723003: mash: Show status area widget, attempt 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: placeholder widget Created 4 years, 4 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
Index: ash/mus/bridge/wm_shelf_mus.h
diff --git a/ash/mus/bridge/wm_shelf_mus.h b/ash/mus/bridge/wm_shelf_mus.h
index d670d18b729a0a486155aab9696838e1fbd99340..4a6f4db9dc4755758471daa740f802a535cb51fb 100644
--- a/ash/mus/bridge/wm_shelf_mus.h
+++ b/ash/mus/bridge/wm_shelf_mus.h
@@ -5,23 +5,23 @@
#ifndef ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
#define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
-#include <stdint.h>
-
-#include <vector>
-
#include "ash/common/shelf/wm_shelf.h"
#include "base/macros.h"
#include "base/observer_list.h"
+namespace views {
+class Widget;
+}
+
namespace ash {
-namespace mus {
+class WmRootWindowController;
-class ShelfLayoutManager;
+namespace mus {
// WmShelf implementation for mus.
class WmShelfMus : public WmShelf {
public:
- explicit WmShelfMus(ShelfLayoutManager* shelf_layout_manager);
+ WmShelfMus(WmRootWindowController* root_window_controller);
~WmShelfMus() override;
// WmShelf:
@@ -54,7 +54,8 @@ class WmShelfMus : public WmShelf {
private:
base::ObserverList<WmShelfObserver> observers_;
- ShelfLayoutManager* shelf_layout_manager_;
+ // Owned by native widget.
+ views::Widget* shelf_widget_;
DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
};
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | ash/mus/bridge/wm_shelf_mus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698