Split //ui/display and create //ui/display/manager.

ui/display/manager/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_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/event_types.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_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/chromeos/display_snapshot_virtual.h"
-#include "ui/display/chromeos/query_content_protection_task.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/chromeos/display_snapshot_virtual.h"
+#include "ui/display/manager/chromeos/query_content_protection_task.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/display/util/display_util.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
 struct GammaRampRGBEntry;
 class DisplayLayoutManager;
 class DisplayMode;
 class DisplaySnapshot;
 class NativeDisplayDelegate;
 class UpdateDisplayConfigurationTask;
 
 // This class interacts directly with the system display configurator.
-class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
+class DISPLAY_MANAGER_EXPORT DisplayConfigurator
+    : public NativeDisplayObserver {
  public:
   typedef uint64_t ContentProtectionClientId;
   static const ContentProtectionClientId kInvalidClientId = 0;
 
   typedef base::Callback<void(bool /* success */)> ConfigurationCallback;
 
   typedef base::Callback<void(bool /* success */)> EnableProtectionCallback;
 
   struct QueryProtectionResponse {
     // True if the query succeeded, false otherwise.
@@ skipping 19 matching lines @@
   typedef std::map<int64_t, uint32_t> ContentProtections;
 
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called after the display mode has been changed. |display| contains the
     // just-applied configuration. Note that the X server is no longer grabbed
     // when this method is called, so the actual configuration could've changed
     // already.
-    virtual void OnDisplayModeChanged(
-        const DisplayStateList& displays) {}
+    virtual void OnDisplayModeChanged(const DisplayStateList& displays) {}
 
     // Called after a display mode change attempt failed. |displays| contains
     // displays that are detected when failed.
     // |failed_new_state| is the new state which the system failed to enter.
     virtual void OnDisplayModeChangeFailed(
         const DisplayStateList& displays,
         MultipleDisplayState failed_new_state) {}
 
     // Called after the power state has been changed. |power_state| contains
     // the just-applied power state.
-    virtual void OnPowerStateChanged(
-        chromeos::DisplayPowerState power_state) {}
+    virtual void OnPowerStateChanged(chromeos::DisplayPowerState power_state) {}
   };
 
   // Interface for classes that make decisions about which display state
   // should be used.
   class StateController {
    public:
     virtual ~StateController() {}
 
     // Called when displays are detected.
     virtual MultipleDisplayState GetStateForDisplayIds(
@@ skipping 375 matching lines @@
   std::unique_ptr<UpdateDisplayConfigurationTask> configuration_task_;
 
   // This must be the last variable.
   base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_