Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: ash/common/devtools/ash_devtools_unittest.cc

Issue 2799993003: Removes couple of methods from WmWindow (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/devtools/ash_devtools_dom_agent.cc ('k') | ash/common/wm/overview/window_grid.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/devtools/ash_devtools_unittest.cc
diff --git a/ash/common/devtools/ash_devtools_unittest.cc b/ash/common/devtools/ash_devtools_unittest.cc
index 4ae947a357fe79d59fb225e572ad346c0ebcd7a4..1b11d2693725fcbaf0760aa0cdc0858441faae70 100644
--- a/ash/common/devtools/ash_devtools_unittest.cc
+++ b/ash/common/devtools/ash_devtools_unittest.cc
@@ -83,7 +83,7 @@ bool Equals(WmWindow* window, DOM::Node* node) {
if (window->GetInternalWidget())
children_count++;
return "Window" == node->getNodeName() &&
- window->GetName() == GetAttributeValue("name", node) &&
+ window->aura_window()->GetName() == GetAttributeValue("name", node) &&
children_count == node->getChildNodeCount(kDefaultChildNodeCount);
}
@@ -140,7 +140,7 @@ WmWindow* GetHighlightingWindow(int root_window_index) {
->GetChildByShellWindowId(kShellWindowId_OverlayContainer)
->GetChildren();
for (WmWindow* window : overlay_windows) {
- if (window->GetName() == "HighlightingWidget")
+ if (window->aura_window()->GetName() == "HighlightingWidget")
return window;
}
NOTREACHED();
@@ -298,10 +298,10 @@ TEST_F(AshDevToolsTest, GetDocumentWithWindowWidgetView) {
std::unique_ptr<views::Widget> widget(
CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
WmWindow* parent_window = WmWindow::Get(widget->GetNativeWindow());
- parent_window->SetName("parent_window");
+ parent_window->aura_window()->SetName("parent_window");
std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(parent_window));
WmWindow* child_window = child_owner->window();
- child_window->SetName("child_window");
+ child_window->aura_window()->SetName("child_window");
widget->Show();
views::View* child_view = new TestView("child_view");
widget->GetRootView()->AddChildView(child_view);
« no previous file with comments | « ash/common/devtools/ash_devtools_dom_agent.cc ('k') | ash/common/wm/overview/window_grid.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698