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

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

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: merge 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
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('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/display/screen_manager_forwarding.cc
diff --git a/services/ui/display/screen_manager_forwarding.cc b/services/ui/display/screen_manager_forwarding.cc
index 9ea90983fabfd12083f02a5cb54ca505504791ea..2ee16f2a1afd82678b206bc593e0c2bb805b1266 100644
--- a/services/ui/display/screen_manager_forwarding.cc
+++ b/services/ui/display/screen_manager_forwarding.cc
@@ -37,11 +37,14 @@ const DisplayMode* GetCorrespondingMode(const DisplaySnapshot& snapshot,
} // namespace
ScreenManagerForwarding::ScreenManagerForwarding()
- : screen_(base::MakeUnique<display::ScreenBase>()), binding_(this) {}
+ : screen_(base::MakeUnique<display::ScreenBase>()), binding_(this) {
+ Screen::SetScreenInstance(screen_.get());
+}
ScreenManagerForwarding::~ScreenManagerForwarding() {
if (native_display_delegate_)
native_display_delegate_->RemoveObserver(this);
+ Screen::SetScreenInstance(nullptr);
}
void ScreenManagerForwarding::AddInterfaces(
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | services/ui/ws/window_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698