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

Unified Diff: services/ui/ws/window_server.h

Issue 2339353003: mus: Remove window server access to clipboard and the drag clipboard. (Closed)
Patch Set: Created 4 years, 3 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 | « services/ui/ws/BUILD.gn ('k') | services/ui/ws/window_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_server.h
diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
index 11fa7cc10c2eb79bdca56877368abf73eb5ced38..cf1fb5b3a2b699193c9d78836d8d9cd039b1de7f 100644
--- a/services/ui/ws/window_server.h
+++ b/services/ui/ws/window_server.h
@@ -16,7 +16,6 @@
#include "base/optional.h"
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/ui/clipboard/clipboard_impl.h"
#include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
#include "services/ui/public/interfaces/window_tree_host.mojom.h"
@@ -137,8 +136,6 @@ class WindowServer : public ServerWindowDelegate,
void OnFirstWindowManagerWindowTreeFactoryReady();
- clipboard::ClipboardImpl* GetClipboardForUser(const UserId& user_id);
-
UserActivityMonitor* GetUserActivityMonitorForUser(const UserId& user_id);
WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set() {
@@ -251,8 +248,6 @@ class WindowServer : public ServerWindowDelegate,
std::map<ClientSpecificId, std::unique_ptr<WindowTree>>;
using UserActivityMonitorMap =
std::map<UserId, std::unique_ptr<UserActivityMonitor>>;
- using UserClipboardMap =
- std::map<UserId, std::unique_ptr<ui::clipboard::ClipboardImpl>>;
struct InFlightWindowManagerChange {
// Identifies the client that initiated the change.
@@ -382,7 +377,6 @@ class WindowServer : public ServerWindowDelegate,
base::Callback<void(ServerWindow*)> window_paint_callback_;
UserActivityMonitorMap activity_monitor_map_;
- UserClipboardMap clipboard_map_;
WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_;
« no previous file with comments | « services/ui/ws/BUILD.gn ('k') | services/ui/ws/window_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698