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

ui/display/manager/display_manager.h

 // Copyright (c) 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.
 
 #ifndef UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_
 #define UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/display/display.h"
-#include "ui/display/display_export.h"
+#include "ui/display/display_layout.h"
 #include "ui/display/display_observer.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/types/display_constants.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/display/chromeos/display_configurator.h"
+#include "ui/display/manager/chromeos/display_configurator.h"
 #endif
 
 namespace gfx {
 class Insets;
 class Rect;
 }
 
 namespace display {
 using DisplayInfoList = std::vector<ManagedDisplayInfo>;
 
 class DisplayLayoutStore;
 class DisplayObserver;
 class Screen;
 
 namespace test {
 class DisplayManagerTestApi;
 }
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
-class DISPLAY_EXPORT DisplayManager
+class DISPLAY_MANAGER_EXPORT DisplayManager
 #if defined(OS_CHROMEOS)
     : public ui::DisplayConfigurator::SoftwareMirroringController
 #endif
 {
  public:
-  class DISPLAY_EXPORT Delegate {
+  class DISPLAY_MANAGER_EXPORT Delegate {
    public:
     virtual ~Delegate() {}
 
     // Create or updates the mirroring window with |display_info_list|.
     virtual void CreateOrUpdateMirroringDisplay(
         const DisplayInfoList& display_info_list) = 0;
 
     // Closes the mirror window if not necessary.
     virtual void CloseMirroringDisplayIfNotNecessary() = 0;
 
@@ skipping 391 matching lines @@
   base::ObserverList<DisplayObserver> observers_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_