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

Unified Diff: components/mus/ws/window_manager_window_tree_factory.h

Issue 2089023002: Promotes remaining global window manager state into WindowManagerState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: override Created 4 years, 6 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: components/mus/ws/window_manager_window_tree_factory.h
diff --git a/components/mus/ws/window_manager_window_tree_factory.h b/components/mus/ws/window_manager_window_tree_factory.h
index 3725ca6814caceb3f8969b0238d82d17ddc5613f..909e3391d7fa2af113fa49b4b5167f485bb1f951 100644
--- a/components/mus/ws/window_manager_window_tree_factory.h
+++ b/components/mus/ws/window_manager_window_tree_factory.h
@@ -7,8 +7,6 @@
#include <stdint.h>
-#include <memory>
-
#include "components/mus/public/interfaces/window_manager_window_tree_factory.mojom.h"
#include "components/mus/ws/user_id.h"
#include "mojo/public/cpp/bindings/binding.h"
@@ -16,7 +14,6 @@
namespace mus {
namespace ws {
-class GlobalWindowManagerState;
class ServerWindow;
class WindowManagerWindowTreeFactorySet;
class WindowServer;
@@ -40,15 +37,12 @@ class WindowManagerWindowTreeFactory
WindowTree* window_tree() { return window_tree_; }
- void BindPendingRequest();
-
// mojom::WindowManagerWindowTreeFactory:
void CreateWindowTree(mojom::WindowTreeRequest window_tree_request,
mojom::WindowTreeClientPtr window_tree_client) override;
private:
friend class test::WindowManagerWindowTreeFactorySetTestApi;
- struct PendingRequest;
// Used by tests.
WindowManagerWindowTreeFactory(WindowManagerWindowTreeFactorySet* registry,
@@ -65,10 +59,6 @@ class WindowManagerWindowTreeFactory
// Owned by WindowServer.
WindowTree* window_tree_;
- std::unique_ptr<PendingRequest> pending_request_;
-
- std::unique_ptr<GlobalWindowManagerState> global_window_manager_state_;
-
DISALLOW_COPY_AND_ASSIGN(WindowManagerWindowTreeFactory);
};
« no previous file with comments | « components/mus/ws/window_manager_state_unittest.cc ('k') | components/mus/ws/window_manager_window_tree_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698