Promotes a handful of members from WmShell to Shell

ash/common/devtools/ash_devtools_dom_agent.h

 // Copyright 2016 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 ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
 #define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
 
-#include "ash/common/wm_shell.h"
-#include "base/compiler_specific.h"
+#include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/ui_devtools/DOM.h"
 #include "components/ui_devtools/devtools_base_agent.h"
 #include "ui/aura/window_observer.h"
 #include "ui/views/view.h"
 #include "ui/views/view_observer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/widget/widget_removals_observer.h"
 
 namespace ash {
+
+class WmWindow;
+
 namespace devtools {
 
 class ASH_EXPORT AshDevToolsDOMAgentObserver {
  public:
   virtual void OnWindowBoundsChanged(WmWindow* window) {}
   virtual void OnWidgetBoundsChanged(views::Widget* widget) {}
   virtual void OnViewBoundsChanged(views::View* view) {}
 };
 
 class ASH_EXPORT AshDevToolsDOMAgent
     : public NON_EXPORTED_BASE(ui::devtools::UiDevToolsBaseAgent<
                                ui::devtools::protocol::DOM::Metainfo>),
       public aura::WindowObserver,
       public views::WidgetObserver,
       public views::WidgetRemovalsObserver,
       public views::ViewObserver {
  public:
-  AshDevToolsDOMAgent(ash::WmShell* shell);
+  AshDevToolsDOMAgent();
   ~AshDevToolsDOMAgent() override;
 
   // DOM::Backend
   ui::devtools::protocol::Response disable() override;
   ui::devtools::protocol::Response getDocument(
       std::unique_ptr<ui::devtools::protocol::DOM::Node>* out_root) override;
   ui::devtools::protocol::Response highlightNode(
       std::unique_ptr<ui::devtools::protocol::DOM::HighlightConfig>
           highlight_config,
       ui::devtools::protocol::Maybe<int> node_id) override;
@@ skipping 71 matching lines @@
   void UpdateHighlight(const WindowAndBoundsPair& window_and_bounds,
                        SkColor background,
                        SkColor border);
   ui::devtools::protocol::Response HighlightNode(
       std::unique_ptr<ui::devtools::protocol::DOM::HighlightConfig>
           highlight_config,
       int node_id);
   bool IsHighlightingWindow(WmWindow* window);
 
   std::unique_ptr<views::Widget> widget_for_highlighting_;
-  ash::WmShell* shell_;
 
   using WindowToNodeIdMap = std::unordered_map<WmWindow*, int>;
   WindowToNodeIdMap window_to_node_id_map_;
   using NodeIdToWindowMap = std::unordered_map<int, WmWindow*>;
   NodeIdToWindowMap node_id_to_window_map_;
 
   using WidgetToNodeIdMap = std::unordered_map<views::Widget*, int>;
   WidgetToNodeIdMap widget_to_node_id_map_;
   using NodeIdToWidgetMap = std::unordered_map<int, views::Widget*>;
   NodeIdToWidgetMap node_id_to_widget_map_;
 
   using ViewToNodeIdMap = std::unordered_map<views::View*, int>;
   ViewToNodeIdMap view_to_node_id_map_;
   using NodeIdToViewMap = std::unordered_map<int, views::View*>;
   NodeIdToViewMap node_id_to_view_map_;
 
   base::ObserverList<AshDevToolsDOMAgentObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AshDevToolsDOMAgent);
 };
 
 }  // namespace devtools
 }  // namespace ash
 
 #endif  // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_