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

ui/display/types/display_snapshot.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_TYPES_CHROMEOS_DISPLAY_SNAPSHOT_H_
-#define UI_DISPLAY_TYPES_CHROMEOS_DISPLAY_SNAPSHOT_H_
+#ifndef UI_DISPLAY_TYPES_DISPLAY_SNAPSHOT_H_
+#define UI_DISPLAY_TYPES_DISPLAY_SNAPSHOT_H_
 
 #include <vector>
 
-#include "ui/display/types/chromeos/display_mode.h"
 #include "ui/display/types/display_constants.h"
+#include "ui/display/types/display_mode.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ui {
 
 // This class represents the state of a display at one point in time. Platforms
 // will extend this class in order to add platform specific configuration and
 // identifiers required to configure this display.
 class DISPLAY_TYPES_EXPORT DisplaySnapshot {
  public:
@@ skipping 58 matching lines @@
   const DisplayMode* current_mode_;
 
   // "Best" mode supported by the output.
   const DisplayMode* native_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplaySnapshot);
 };
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_TYPES_CHROMEOS_DISPLAY_SNAPSHOT_H_
+#endif  // UI_DISPLAY_TYPES_DISPLAY_SNAPSHOT_H_