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

Unified Diff: components/mus/example/wm/window_manager_application.h

Issue 1419793006: Makes windowmanager draw non-client area (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move wm nonclientframeview to wm Created 5 years, 1 month 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: components/mus/example/wm/window_manager_application.h
diff --git a/components/mus/example/wm/window_manager_application.h b/components/mus/example/wm/window_manager_application.h
index 65be45952aebcf67ae62f12834594650ace6dcd8..17659a209ec500001bb08a01d04ec1cbac4ed2df 100644
--- a/components/mus/example/wm/window_manager_application.h
+++ b/components/mus/example/wm/window_manager_application.h
@@ -21,9 +21,12 @@
class BackgroundLayout;
class ShelfLayout;
class WindowLayout;
-
class WindowManagerImpl;
+namespace views {
+class AuraInit;
+}
+
class WindowManagerApplication
: public mojo::ApplicationDelegate,
public mus::WindowObserver,
@@ -41,6 +44,8 @@ class WindowManagerApplication
mus::Window* GetWindowForContainer(ash::mojom::Container container);
mus::Window* GetWindowById(mus::Id id);
+ mojo::ApplicationImpl* app() { return app_; }
+
private:
// ApplicationDelegate:
void Initialize(mojo::ApplicationImpl* app) override;
@@ -66,8 +71,12 @@ class WindowManagerApplication
mus::Window* root_;
int window_count_;
+ mojo::ApplicationImpl* app_;
+
mus::mojom::WindowTreeHostPtr host_;
+ scoped_ptr<views::AuraInit> aura_init_;
Ben Goodger (Google) 2015/11/04 23:03:21 you'll have to merge my other change.
sky 2015/11/05 00:18:02 Done.
+
// |window_manager_| is created once OnEmbed() is called. Until that time
// |requests_| stores any pending WindowManager interface requests.
scoped_ptr<WindowManagerImpl> window_manager_;

Powered by Google App Engine
This is Rietveld 408576698