display: Move ui/display/types/chromeos/* to ui/display/types/*

ui/display/chromeos/display_configurator.h

 // 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.
 
 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/display/display_export.h"
-#include "ui/display/types/chromeos/native_display_observer.h"
 #include "ui/display/types/display_constants.h"
+#include "ui/display/types/native_display_observer.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class Point;
 class Size;
 }
 
 namespace ui {
 class DisplayMode;
 class DisplaySnapshot;
@@ skipping 307 matching lines @@
 
   // Display protection requests of each client.
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_