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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/mojo/services/view_manager/root_node_manager.cc

Issue 405803002: Revert 284322 "Allow EmbedRoot to be called multiple times." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | « trunk/src/mojo/services/public/interfaces/view_manager/view_manager.mojom ('k') | trunk/src/mojo/services/view_manager/test_change_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/services/view_manager/root_node_manager.cc
===================================================================
--- trunk/src/mojo/services/view_manager/root_node_manager.cc (revision 284322)
+++ trunk/src/mojo/services/view_manager/root_node_manager.cc (working copy)
@@ -88,12 +88,8 @@
}
void RootNodeManager::EmbedRoot(const std::string& url) {
- if (connection_map_.empty()) {
- EmbedImpl(kRootConnection, String::From(url), InvalidNodeId());
- return;
- }
- ViewManagerServiceImpl* connection = GetConnection(kWindowManagerConnection);
- connection->client()->EmbedRoot(url);
+ CHECK(connection_map_.empty());
+ EmbedImpl(kRootConnection, String::From(url), InvalidNodeId());
}
void RootNodeManager::Embed(ConnectionSpecificId creator_id,
« no previous file with comments | « trunk/src/mojo/services/public/interfaces/view_manager/view_manager.mojom ('k') | trunk/src/mojo/services/view_manager/test_change_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698