Use injection and remove ozone dependency from ui/display

extensions/shell/browser/shell_desktop_controller_aura.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/shell/browser/shell_desktop_controller_aura.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
+
+#if defined(USE_X11)
+#include "ui/display/chromeos/x11/native_display_delegate_x11.h"
 #endif
 
+#if defined(USE_OZONE)
+#include "ui/display/types/native_display_delegate.h"
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
+#endif  // defined(OS_CHROMEOS)
+
 namespace extensions {
 namespace {
 
 // A simple layout manager that makes each new window fill its parent.
 class FillLayout : public aura::LayoutManager {
  public:
   FillLayout() {}
   ~FillLayout() override {}
 
  private:
@@ skipping 104 matching lines @@
 }  // namespace
 
 ShellDesktopControllerAura::ShellDesktopControllerAura()
     : app_window_client_(new ShellAppWindowClient) {
   extensions::AppWindowClient::Set(app_window_client_.get());
 
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
       this);
   display_configurator_.reset(new ui::DisplayConfigurator);
-  display_configurator_->Init(false);
+#if defined(USE_OZONE)
+  display_configurator_->Init(
+      ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(), false);
+#elif defined(USE_X11)
+  display_configurator_->Init(
+      base::WrapUnique(new ui::NativeDisplayDelegateX11()), false);
+#endif
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
   CreateRootWindow();
 }
 
 ShellDesktopControllerAura::~ShellDesktopControllerAura() {
   CloseAppWindows();
   DestroyRootWindow();
 #if defined(OS_CHROMEOS)
@@ skipping 157 matching lines @@
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0]->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace extensions