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

Unified Diff: services/ui/display/screen_manager_forwarding.cc

Issue 2829733002: mus: Changes SetDisplayRoot() to create actual display (Closed)
Patch Set: unnecessary get Created 3 years, 8 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: services/ui/display/screen_manager_forwarding.cc
diff --git a/services/ui/display/screen_manager_forwarding.cc b/services/ui/display/screen_manager_forwarding.cc
index c3bfd521b9c52e7e763a0db0e4ef878eacea8137..c218d27924d123ae45176d0b7bfa1a418f39b40f 100644
--- a/services/ui/display/screen_manager_forwarding.cc
+++ b/services/ui/display/screen_manager_forwarding.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "services/service_manager/public/cpp/binder_registry.h"
+#include "ui/display/screen_base.h"
#include "ui/display/types/display_constants.h"
#include "ui/display/types/display_snapshot_mojo.h"
#include "ui/display/types/native_display_delegate.h"
@@ -35,10 +36,8 @@ const DisplayMode* GetCorrespondingMode(const DisplaySnapshot& snapshot,
} // namespace
-// TODO(sky/kylechar): Change ScreenManager::Create() to make a
-// ScreenManagerForwarding in mus mode.
-
-ScreenManagerForwarding::ScreenManagerForwarding() : binding_(this) {}
+ScreenManagerForwarding::ScreenManagerForwarding()
+ : screen_(base::MakeUnique<display::ScreenBase>()), binding_(this) {}
ScreenManagerForwarding::~ScreenManagerForwarding() {
if (native_display_delegate_)
@@ -56,6 +55,10 @@ void ScreenManagerForwarding::Init(ScreenManagerDelegate* delegate) {
void ScreenManagerForwarding::RequestCloseDisplay(int64_t display_id) {}
+display::ScreenBase* ScreenManagerForwarding::GetScreen() {
+ return screen_.get();
+}
+
void ScreenManagerForwarding::OnConfigurationChanged() {
if (observer_.is_bound())
observer_->OnConfigurationChanged();
« no previous file with comments | « services/ui/display/screen_manager_forwarding.h ('k') | services/ui/display/screen_manager_ozone_external.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698