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

Unified Diff: components/mus/ws/connection_manager.cc

Issue 1618963005: Revert of Start of display management for mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « components/mus/ws/connection_manager.h ('k') | components/mus/ws/display_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/connection_manager.cc
diff --git a/components/mus/ws/connection_manager.cc b/components/mus/ws/connection_manager.cc
index 1c6fe6fd4309024996b9291307e194cf229ecd3f..fd7e78211b9c3a210848ba5a6c525d35c6f13243 100644
--- a/components/mus/ws/connection_manager.cc
+++ b/components/mus/ws/connection_manager.cc
@@ -20,6 +20,7 @@
#include "ui/gfx/geometry/size_conversions.h"
namespace mus {
+
namespace ws {
ConnectionManager::ConnectionManager(
@@ -253,11 +254,6 @@
return host_connection_map_.begin()->first;
}
-void ConnectionManager::AddDisplayManagerBinding(
- mojo::InterfaceRequest<mojom::DisplayManager> request) {
- display_manager_bindings_.AddBinding(this, std::move(request));
-}
-
uint32_t ConnectionManager::GenerateWindowManagerChangeId(
WindowTreeImpl* source,
uint32_t client_change_id) {
@@ -587,36 +583,6 @@
}
}
-void ConnectionManager::AddObserver(mojom::DisplayManagerObserverPtr observer) {
- mojo::Array<mojom::DisplayPtr> displays(host_connection_map_.size());
- {
- size_t i = 0;
- int next_x = 0;
- for (auto& pair : host_connection_map_) {
- const WindowTreeHostImpl* tree_host = pair.first;
- const ServerWindow* root = tree_host->root_window();
- displays[i]->id = tree_host->id();
- displays[i]->bounds = mojo::Rect::New();
- displays[i]->bounds->x = next_x;
- displays[i]->bounds->y = 0;
- displays[i]->bounds->width = root->bounds().size().width();
- displays[i]->bounds->height = root->bounds().size().height();
- next_x += displays[i]->bounds->width;
- // TODO(sky): window manager needs an API to set the work area.
- displays[i]->work_area = displays[1]->bounds.Clone();
- displays[i]->device_pixel_ratio =
- tree_host->GetViewportMetrics().device_pixel_ratio;
- displays[i]->rotation = tree_host->GetRotation();
- // TODO(sky): make this real.
- displays[i]->is_primary = i == 0;
- // TODO(sky): make this real.
- displays[i]->touch_support = mojom::TouchSupport::UNKNOWN;
- ++i;
- }
- }
- observer->OnDisplays(std::move(displays));
- display_manager_observers_.AddInterfacePtr(std::move(observer));
-}
-
} // namespace ws
+
} // namespace mus
« no previous file with comments | « components/mus/ws/connection_manager.h ('k') | components/mus/ws/display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698