Index: components/ui_devtools/views/ui_element.cc |
diff --git a/ash/devtools/ui_element.cc b/components/ui_devtools/views/ui_element.cc |
similarity index 82% |
rename from ash/devtools/ui_element.cc |
rename to components/ui_devtools/views/ui_element.cc |
index 0249d823d1f5ad9f2cf42c683f9dd5f4e6c99f83..a30877f549745c4e50efe8648b8239e7bdd550b1 100644 |
--- a/ash/devtools/ui_element.cc |
+++ b/components/ui_devtools/views/ui_element.cc |
@@ -2,16 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ash/devtools/ui_element.h" |
+#include "components/ui_devtools/views/ui_element.h" |
#include <algorithm> |
-#include "ash/devtools/ui_element_delegate.h" |
-#include "ash/devtools/view_element.h" |
-#include "ash/devtools/widget_element.h" |
-#include "ash/devtools/window_element.h" |
+#include "components/ui_devtools/views/ui_element_delegate.h" |
+#include "components/ui_devtools/views/view_element.h" |
+#include "components/ui_devtools/views/widget_element.h" |
+#include "components/ui_devtools/views/window_element.h" |
-namespace ash { |
+namespace ui { |
namespace devtools { |
namespace { |
@@ -63,7 +63,7 @@ void UIElement::ReorderChild(UIElement* child, int new_index) { |
children_.erase(iter); |
// Move child to new position |new_index| in vector |children_|. |
- new_index = std::min(children_.size() - 1, static_cast<size_t>(new_index)); |
+ new_index = std::min(static_cast<int>(children_.size()) - 1, new_index); |
iter = children_.begin() + new_index; |
children_.insert(iter, child); |
delegate()->OnUIElementReordered(child->parent(), child); |
@@ -77,4 +77,4 @@ UIElement::UIElement(const UIElementType type, |
} |
} // namespace devtools |
-} // namespace ash |
+} // namespace ui |