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

Unified Diff: ash/aura/shell_port_classic.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 | « no previous file | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/shell_port_classic.cc
diff --git a/ash/aura/shell_port_classic.cc b/ash/aura/shell_port_classic.cc
index 766ae123ad3c22b46a55d32b78b402ff8085e5f4..d2eaa4b69b90175fedea77654c722a8d1f948831 100644
--- a/ash/aura/shell_port_classic.cc
+++ b/ash/aura/shell_port_classic.cc
@@ -42,6 +42,7 @@
#if defined(USE_X11)
#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
+#include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h"
#endif
#if defined(USE_OZONE)
@@ -267,7 +268,7 @@ ShellPortClassic::CreateNativeDisplayDelegate() {
#if defined(USE_OZONE)
return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
#else
- return nullptr;
+ return base::MakeUnique<display::NativeDisplayDelegateX11>();
#endif
}
« no previous file with comments | « no previous file | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698