Add place holder to move gfx::Display/Screen to ui/display

ui/display/chromeos/display_configurator.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 "ui/display/chromeos/display_configurator.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "ui/display/chromeos/apply_content_protection_task.h"
 #include "ui/display/chromeos/display_layout_manager.h"
 #include "ui/display/chromeos/display_snapshot_virtual.h"
 #include "ui/display/chromeos/display_util.h"
 #include "ui/display/chromeos/update_display_configuration_task.h"
+#include "ui/display/display.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/display/util/display_util.h"
-#include "ui/gfx/display.h"
 
 namespace ui {
 
 namespace {
 
 typedef std::vector<const DisplayMode*> DisplayModeList;
 
 // The delay to perform configuration after RRNotify. See the comment for
 // |configure_timer_|.
 const int kConfigureDelayMs = 500;
@@ skipping 1076 matching lines @@
 }
 
 void DisplayConfigurator::NotifyPowerStateObservers() {
   FOR_EACH_OBSERVER(
       Observer, observers_, OnPowerStateChanged(current_power_state_));
 }
 
 int64_t DisplayConfigurator::AddVirtualDisplay(gfx::Size display_size) {
   if (last_virtual_display_id_ == 0xff) {
     LOG(WARNING) << "Exceeded virtual display id limit";
-    return gfx::Display::kInvalidDisplayID;
+    return display::Display::kInvalidDisplayID;
   }
 
   DisplaySnapshotVirtual* virtual_snapshot =
       new DisplaySnapshotVirtual(GenerateDisplayID(kReservedManufacturerID, 0x0,
                                                    ++last_virtual_display_id_),
                                  display_size);
   virtual_display_snapshots_.push_back(virtual_snapshot);
   ConfigureDisplays();
 
   return virtual_snapshot->display_id();
@@ skipping 20 matching lines @@
   last_virtual_display_id_ = max_display_id & 0xff;
 
   return true;
 }
 
 bool DisplayConfigurator::IsDisplayOn() const {
   return current_power_state_ != chromeos::DISPLAY_POWER_ALL_OFF;
 }
 
 }  // namespace ui