Remove WmLookup.

ash/common/devtools/ash_devtools_dom_agent.cc

 // 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.
 
 #include "ash/common/devtools/ash_devtools_dom_agent.h"
 
-#include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "components/ui_devtools/devtools_server.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/display.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 
 namespace ash {
@@ skipping 341 matching lines @@
   RemoveWidgetNode(widget, remove_observer);
 }
 
 void AshDevToolsDOMAgent::RemoveWidgetNode(views::Widget* widget,
                                            bool remove_observer) {
   WidgetToNodeIdMap::iterator widget_to_node_id_it =
       widget_to_node_id_map_.find(widget);
   DCHECK(widget_to_node_id_it != widget_to_node_id_map_.end());
 
   int node_id = widget_to_node_id_it->second;
-  int parent_id =
-      GetNodeIdFromWindow(WmLookup::Get()->GetWindowForWidget(widget));
+  int parent_id = GetNodeIdFromWindow(WmWindow::Get(widget->GetNativeWindow()));
 
   if (remove_observer)
     widget->RemoveRemovalsObserver(this);
 
   NodeIdToWidgetMap::iterator node_id_to_widget_it =
       node_id_to_widget_map_.find(node_id);
   DCHECK(node_id_to_widget_it != node_id_to_widget_map_.end());
 
   widget_to_node_id_map_.erase(widget_to_node_id_it);
   node_id_to_widget_map_.erase(node_id_to_widget_it);
@@ skipping 66 matching lines @@
 }
 
 AshDevToolsDOMAgent::WindowAndBoundsPair
 AshDevToolsDOMAgent::GetNodeWindowAndBounds(int node_id) {
   WmWindow* window = GetWindowFromNodeId(node_id);
   if (window)
     return std::make_pair(window, window->GetBoundsInScreen());
 
   views::Widget* widget = GetWidgetFromNodeId(node_id);
   if (widget) {
-    return std::make_pair(WmLookup::Get()->GetWindowForWidget(widget),
+    return std::make_pair(WmWindow::Get(widget->GetNativeWindow()),
                           widget->GetWindowBoundsInScreen());
   }
 
   views::View* view = GetViewFromNodeId(node_id);
   if (view) {
     gfx::Rect bounds = view->GetBoundsInScreen();
-    return std::make_pair(
-        WmLookup::Get()->GetWindowForWidget(view->GetWidget()), bounds);
+    return std::make_pair(WmWindow::Get(view->GetWidget()->GetNativeWindow()),
+                          bounds);
   }
 
   return std::make_pair(nullptr, gfx::Rect());
 }
 
 void AshDevToolsDOMAgent::InitializeHighlightingWidget() {
   DCHECK(!widget_for_highlighting_);
   widget_for_highlighting_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
@@ skipping 12 matching lines @@
 
 void AshDevToolsDOMAgent::UpdateHighlight(
     const WindowAndBoundsPair& window_and_bounds,
     SkColor background,
     SkColor border) {
   constexpr int kBorderThickness = 1;
   views::View* root_view = widget_for_highlighting_->GetRootView();
   root_view->SetBorder(views::CreateSolidBorder(kBorderThickness, border));
   root_view->set_background(
       views::Background::CreateSolidBackground(background));
-  WmLookup::Get()
-      ->GetWindowForWidget(widget_for_highlighting_.get())
+  WmWindow::Get(widget_for_highlighting_->GetNativeWindow())
       ->SetBoundsInScreen(window_and_bounds.second,
                           window_and_bounds.first->GetDisplayNearestWindow());
 }
 
 ui::devtools::protocol::Response AshDevToolsDOMAgent::HighlightNode(
     std::unique_ptr<ui::devtools::protocol::DOM::HighlightConfig>
         highlight_config,
     int node_id) {
   if (!widget_for_highlighting_)
     InitializeHighlightingWidget();
@@ skipping 16 matching lines @@
   return ui::devtools::protocol::Response::OK();
 }
 
 bool AshDevToolsDOMAgent::IsHighlightingWindow(WmWindow* window) {
   return widget_for_highlighting_ &&
          GetWidgetFromWmWindow(window) == widget_for_highlighting_.get();
 }
 
 }  // namespace devtools
 }  // namespace ash