Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/devtools/ash_devtools_css_agent.h" | 5 #include "ash/devtools/ash_devtools_css_agent.h" |
| 6 #include "ash/devtools/ash_devtools_dom_agent.h" | 6 #include "ash/devtools/ash_devtools_dom_agent.h" |
| 7 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_port.h" | 10 #include "ash/shell_port.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 aura::Window* highlighting_window = GetHighlightingWindow(root_window_index); | 171 aura::Window* highlighting_window = GetHighlightingWindow(root_window_index); |
| 172 EXPECT_TRUE(highlighting_window->IsVisible()); | 172 EXPECT_TRUE(highlighting_window->IsVisible()); |
| 173 EXPECT_EQ(bounds, highlighting_window->GetBoundsInScreen()); | 173 EXPECT_EQ(bounds, highlighting_window->GetBoundsInScreen()); |
| 174 EXPECT_EQ(kBackgroundColor, GetInternalWidgetForWindow(highlighting_window) | 174 EXPECT_EQ(kBackgroundColor, GetInternalWidgetForWindow(highlighting_window) |
| 175 ->GetRootView() | 175 ->GetRootView() |
| 176 ->background() | 176 ->background() |
| 177 ->get_color()); | 177 ->get_color()); |
| 178 } | 178 } |
| 179 | 179 |
| 180 WmWindow* GetPrimaryRootWindow() { | 180 WmWindow* GetPrimaryRootWindow() { |
| 181 return WmShell::Get()->GetPrimaryRootWindow(); | 181 return ShellPort::Get()->GetPrimaryRootWindow(); |
|
oshima
2017/04/14 04:54:26
this isn't your change, is it?
wutao
2017/04/14 07:48:28
The old version is in my another cl (not landed ye
| |
| 182 } | 182 } |
| 183 | 183 |
| 184 } // namespace | 184 } // namespace |
| 185 | 185 |
| 186 class AshDevToolsTest : public AshTest { | 186 class AshDevToolsTest : public AshTest { |
| 187 public: | 187 public: |
| 188 AshDevToolsTest() {} | 188 AshDevToolsTest() {} |
| 189 ~AshDevToolsTest() override {} | 189 ~AshDevToolsTest() override {} |
| 190 | 190 |
| 191 views::internal::NativeWidgetPrivate* CreateTestNativeWidget() { | 191 views::internal::NativeWidgetPrivate* CreateTestNativeWidget() { |
| (...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 782 SetStyleTexts(root_view_node, "\nheight: 73;\n ", true); | 782 SetStyleTexts(root_view_node, "\nheight: 73;\n ", true); |
| 783 EXPECT_EQ(gfx::Rect(25, 35, 45, 73), root_view->bounds()); | 783 EXPECT_EQ(gfx::Rect(25, 35, 45, 73), root_view->bounds()); |
| 784 | 784 |
| 785 SetStyleTexts(root_view_node, "\nx: 10; y: 23; width: 52;\nvisibility: 1;\n", | 785 SetStyleTexts(root_view_node, "\nx: 10; y: 23; width: 52;\nvisibility: 1;\n", |
| 786 true); | 786 true); |
| 787 EXPECT_EQ(gfx::Rect(10, 23, 52, 73), root_view->bounds()); | 787 EXPECT_EQ(gfx::Rect(10, 23, 52, 73), root_view->bounds()); |
| 788 EXPECT_TRUE(root_view->visible()); | 788 EXPECT_TRUE(root_view->visible()); |
| 789 } | 789 } |
| 790 | 790 |
| 791 } // namespace ash | 791 } // namespace ash |
| OLD | NEW |