Remove DisplayChangeObserver ash dependencies.

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_observer.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_string_provider.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"
 #endif
 
 namespace gfx {
 class Insets;
 class Rect;
@@ skipping 32 matching lines @@
     // Called before and after the display configuration changes.  When
     // |clear_focus| is true, the implementation should deactivate the active
     // window and set the focus window to NULL.
     virtual void PreDisplayConfigurationChange(bool clear_focus) = 0;
     virtual void PostDisplayConfigurationChange(bool must_clear_window) = 0;
 
 #if defined(OS_CHROMEOS)
     // Get the ui::DisplayConfigurator.
     virtual ui::DisplayConfigurator* display_configurator() = 0;
 #endif
-
-    virtual std::string GetInternalDisplayNameString() = 0;
-    virtual std::string GetUnknownDisplayNameString() = 0;
   };
 
   // How the second display will be used.
   // 1) EXTENDED mode extends the desktop to the second dislpay.
   // 2) MIRRORING mode copies the content of the primary display to
   //    the 2nd display. (Software Mirroring).
   // 3) UNIFIED mode creates single desktop across multiple displays.
   enum MultiDisplayMode {
     EXTENDED = 0,
     MIRRORING,
     UNIFIED,
   };
 
   // The display ID for a virtual display assigned to a unified desktop.
   static int64_t kUnifiedDisplayId;
 
-  explicit DisplayManager(std::unique_ptr<Screen> screen);
+  DisplayManager(std::unique_ptr<Screen> screen,
+                 std::unique_ptr<DisplayStringProvider> string_provider);
 #if defined(OS_CHROMEOS)
   ~DisplayManager() override;
 #else
   virtual ~DisplayManager();
 #endif
 
   DisplayLayoutStore* layout_store() { return layout_store_.get(); }
 
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
@@ skipping 294 matching lines @@
 
   // Applies the |layout| and updates the bounds of displays in |display_list|.
   // |updated_ids| contains the ids for displays whose bounds have changed.
   void ApplyDisplayLayout(const DisplayLayout& layout,
                           Displays* display_list,
                           std::vector<int64_t>* updated_ids);
 
   Delegate* delegate_ = nullptr;  // not owned.
 
   std::unique_ptr<Screen> screen_;
-
+  std::unique_ptr<DisplayStringProvider> string_provider_;
   std::unique_ptr<DisplayLayoutStore> layout_store_;
 
   int64_t first_display_id_ = kInvalidDisplayId;
 
   // List of current active displays.
   Displays active_display_list_;
   // This list does not include the displays that will be removed if
   // |UpdateDisplaysWith| is under execution.
   // See https://crbug.com/632755
   Displays active_only_display_list_;
@@ skipping 36 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_