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

Unified Diff: components/view_manager/view_manager_client_apptest.cc

Issue 1317713006: Changes around how embed roots are set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 5 years, 3 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 | « components/view_manager/server_view.cc ('k') | components/view_manager/view_tree_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/view_manager/view_manager_client_apptest.cc
diff --git a/components/view_manager/view_manager_client_apptest.cc b/components/view_manager/view_manager_client_apptest.cc
index b09cdd5a38a816f5f928fc461e9a95a1129b60a9..31e64e4a20099e6be1b2b9a06184ddec273432a9 100644
--- a/components/view_manager/view_manager_client_apptest.cc
+++ b/components/view_manager/view_manager_client_apptest.cc
@@ -692,8 +692,8 @@ TEST_F(ViewManagerTest, EmbedRootSeesHierarchyChanged) {
View* embed_view = window_manager()->CreateView();
window_manager()->GetRoot()->AddChild(embed_view);
+ embed_view->SetAccessPolicy(ViewTree::ACCESS_POLICY_EMBED_ROOT);
ViewTreeConnection* vm2 = Embed(embed_view);
- vm2->SetEmbedRoot();
View* vm2_v1 = vm2->CreateView();
vm2->GetRoot()->AddChild(vm2_v1);
@@ -709,8 +709,8 @@ TEST_F(ViewManagerTest, EmbedFromEmbedRoot) {
View* embed_view = window_manager()->CreateView();
window_manager()->GetRoot()->AddChild(embed_view);
+ embed_view->SetAccessPolicy(ViewTree::ACCESS_POLICY_EMBED_ROOT);
ViewTreeConnection* vm2 = Embed(embed_view);
- vm2->SetEmbedRoot();
View* vm2_v1 = vm2->CreateView();
vm2->GetRoot()->AddChild(vm2_v1);
« no previous file with comments | « components/view_manager/server_view.cc ('k') | components/view_manager/view_tree_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698