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

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

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/window_server.h ('k') | ui/views/mus/clipboard_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index f4d9a4ec082a6ee855a047df80d7a017b7b147d6..7fb04ad454dbf2e9a5a1ea2a904d01185d0fa4df 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -248,12 +248,6 @@ void WindowServer::OnFirstWindowManagerWindowTreeFactoryReady() {
delegate_->CreateDefaultDisplays();
}
-ui::clipboard::ClipboardImpl* WindowServer::GetClipboardForUser(
- const UserId& user_id) {
- DCHECK_GT(clipboard_map_.count(user_id), 0u);
- return clipboard_map_[user_id].get();
-}
-
UserActivityMonitor* WindowServer::GetUserActivityMonitorForUser(
const UserId& user_id) {
DCHECK_GT(activity_monitor_map_.count(user_id), 0u);
@@ -825,12 +819,10 @@ void WindowServer::OnActiveUserIdChanged(const UserId& previously_active_id,
void WindowServer::OnUserIdAdded(const UserId& id) {
activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
- clipboard_map_[id] = base::MakeUnique<clipboard::ClipboardImpl>();
}
void WindowServer::OnUserIdRemoved(const UserId& id) {
activity_monitor_map_.erase(id);
- clipboard_map_.erase(id);
}
} // namespace ws
« no previous file with comments | « services/ui/ws/window_server.h ('k') | ui/views/mus/clipboard_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698