trunk/src/mojo/services/view_manager/view_manager_init_service_impl.cc - Issue 405803002: Revert 284322 "Allow EmbedRoot to be called multiple times."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/mojo/services/view_manager/view_manager_init_service_impl.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:

Index: trunk/src/mojo/services/view_manager/view_manager_init_service_impl.cc

===================================================================

--- trunk/src/mojo/services/view_manager/view_manager_init_service_impl.cc (revision 284322)

+++ trunk/src/mojo/services/view_manager/view_manager_init_service_impl.cc (working copy)

@@ -44,8 +44,11 @@

void ViewManagerInitServiceImpl::EmbedRoot(

const String& url,

const Callback<void(bool)>& callback) {

- // TODO(beng): This means you can only have one EmbedRoot in flight at a time.

- // Keep a vector of these around instead.

+ if (connect_params_) {

+ DVLOG(1) << "Ignoring second connect";

+ callback.Run(false);

+ return;

+ }

connect_params_.reset(new ConnectParams);

connect_params_->url = url.To<std::string>();

connect_params_->callback = callback;