Revert of Create a unified UIElement interface for Widget, View and Window.

ash/devtools/ash_devtools_css_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/devtools/ash_devtools_css_agent.h"
 
-#include "ash/devtools/ui_element.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace devtools {
+
 namespace {
-
 using namespace ui::devtools::protocol;
 
 const char kHeight[] = "height";
 const char kWidth[] = "width";
 const char kX[] = "x";
 const char kY[] = "y";
 const char kVisibility[] = "visibility";
 
 std::unique_ptr<CSS::SourceRange> BuildDefaultSourceRange() {
   // These tell the frontend where in the stylesheet a certain style
@@ skipping 131 matching lines @@
 
     updated_styles->addItem(BuildCSSStyle(node_id, updated_bounds, visible));
 
     if (!SetPropertiesForNodeId(node_id, updated_bounds, visible))
       return NodeNotFoundError(node_id);
   }
   *result = std::move(updated_styles);
   return ui::devtools::protocol::Response::OK();
 }
 
-void AshDevToolsCSSAgent::OnNodeBoundsChanged(int node_id) {
-  InvalidateStyleSheet(node_id);
+void AshDevToolsCSSAgent::OnWindowBoundsChanged(aura::Window* window) {
+  InvalidateStyleSheet(dom_agent_->GetNodeIdFromWindow(window));
+}
+
+void AshDevToolsCSSAgent::OnWidgetBoundsChanged(views::Widget* widget) {
+  InvalidateStyleSheet(dom_agent_->GetNodeIdFromWidget(widget));
+}
+
+void AshDevToolsCSSAgent::OnViewBoundsChanged(views::View* view) {
+  InvalidateStyleSheet(dom_agent_->GetNodeIdFromView(view));
 }
 
 std::unique_ptr<ui::devtools::protocol::CSS::CSSStyle>
 AshDevToolsCSSAgent::GetStylesForNode(int node_id) {
   gfx::Rect bounds;
   bool visible = false;
   return GetPropertiesForNodeId(node_id, &bounds, &visible)
              ? BuildCSSStyle(node_id, bounds, visible)
              : nullptr;
 }
 
 void AshDevToolsCSSAgent::InvalidateStyleSheet(int node_id) {
   // The stylesheetId for each node is equivalent to its node_id (as a string).
   frontend()->styleSheetChanged(base::IntToString(node_id));
 }
 
 bool AshDevToolsCSSAgent::GetPropertiesForNodeId(int node_id,
                                                  gfx::Rect* bounds,
                                                  bool* visible) {
-  UIElement* ui_element = dom_agent_->GetElementFromNodeId(node_id);
-  if (ui_element) {
-    ui_element->GetBounds(bounds);
-    ui_element->GetVisible(visible);
+  aura::Window* window = dom_agent_->GetWindowFromNodeId(node_id);
+  if (window) {
+    *bounds = window->bounds();
+    *visible = window->IsVisible();
+    return true;
+  }
+  views::Widget* widget = dom_agent_->GetWidgetFromNodeId(node_id);
+  if (widget) {
+    *bounds = widget->GetRestoredBounds();
+    *visible = widget->IsVisible();
+    return true;
+  }
+  views::View* view = dom_agent_->GetViewFromNodeId(node_id);
+  if (view) {
+    *bounds = view->bounds();
+    *visible = view->visible();
     return true;
   }
   return false;
 }
 
 bool AshDevToolsCSSAgent::SetPropertiesForNodeId(int node_id,
                                                  const gfx::Rect& bounds,
                                                  bool visible) {
-  UIElement* ui_element = dom_agent_->GetElementFromNodeId(node_id);
-  if (ui_element) {
-    ui_element->SetBounds(bounds);
-    ui_element->SetVisible(visible);
+  aura::Window* window = dom_agent_->GetWindowFromNodeId(node_id);
+  if (window) {
+    window->SetBounds(bounds);
+    if (visible != window->IsVisible()) {
+      if (visible)
+        window->Show();
+      else
+        window->Hide();
+    }
+    return true;
+  }
+  views::Widget* widget = dom_agent_->GetWidgetFromNodeId(node_id);
+  if (widget) {
+    widget->SetBounds(bounds);
+    if (visible != widget->IsVisible()) {
+      if (visible)
+        widget->Show();
+      else
+        widget->Hide();
+    }
+    return true;
+  }
+  views::View* view = dom_agent_->GetViewFromNodeId(node_id);
+  if (view) {
+    view->SetBoundsRect(bounds);
+    if (visible != view->visible())
+      view->SetVisible(visible);
     return true;
   }
   return false;
 }
 
 }  // namespace devtools
 }  // namespace ash