Rename gfx::Display/Screen to display::Display/Screen in views/wm

ui/views/examples/examples_main.cc

 // Copyright 2012 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 <memory>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/test/in_process_context_factory.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/examples/examples_window.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #include "ui/wm/core/wm_state.h"
 #endif
 
@@ skipping 57 matching lines @@
   ui::InitializeInputMethodForTesting();
   ui::MaterialDesignController::Initialize();
 
   {
     views::DesktopTestViewsDelegate views_delegate;
 #if defined(USE_AURA)
     wm::WMState wm_state;
 #endif
 #if !defined(OS_CHROMEOS) && defined(USE_AURA)
     std::unique_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen());
-    gfx::Screen::SetScreenInstance(desktop_screen.get());
+    display::Screen::SetScreenInstance(desktop_screen.get());
 #endif
 
     views::examples::ShowExamplesWindow(
         views::examples::QUIT_ON_CLOSE, nullptr,
         std::unique_ptr<ScopedVector<views::examples::ExampleBase>>());
 
     base::RunLoop().Run();
 
     ui::ResourceBundle::CleanupSharedInstance();
   }
 
   ui::ShutdownInputMethod();
 
 #if defined(USE_AURA)
   env.reset();
 #endif
 
   return 0;
 }