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

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

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Removing debug include. Created 3 years, 5 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/display/screen_manager_forwarding.h ('k') | services/ui/gpu/gpu_main.h » ('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 1955edbf8a4e31d038b822ff7d8cf54b6c9c257d..0c869fd77fd478d1c415b8eabd0bc8aa1a989570 100644
--- a/services/ui/display/screen_manager_forwarding.cc
+++ b/services/ui/display/screen_manager_forwarding.cc
@@ -39,17 +39,20 @@ const DisplayMode* GetCorrespondingMode(const DisplaySnapshot& snapshot,
} // namespace
-ScreenManagerForwarding::ScreenManagerForwarding()
- : screen_(base::MakeUnique<display::ScreenBase>()),
+ScreenManagerForwarding::ScreenManagerForwarding(Mode mode)
+ : is_in_process_(mode == Mode::IN_WM_PROCESS),
+ screen_(base::MakeUnique<display::ScreenBase>()),
binding_(this),
test_controller_binding_(this) {
- Screen::SetScreenInstance(screen_.get());
+ if (!is_in_process_)
+ Screen::SetScreenInstance(screen_.get());
}
ScreenManagerForwarding::~ScreenManagerForwarding() {
if (native_display_delegate_)
native_display_delegate_->RemoveObserver(this);
- Screen::SetScreenInstance(nullptr);
+ if (!is_in_process_)
+ Screen::SetScreenInstance(nullptr);
}
void ScreenManagerForwarding::AddInterfaces(
« no previous file with comments | « services/ui/display/screen_manager_forwarding.h ('k') | services/ui/gpu/gpu_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698