content/browser/browser_main_runner.cc - Issue 733533002: Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid

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: content/browser/browser_main_runner.cc

Issue 733533002: Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use anonymous namespace for CallbackChecker Created 6 years, 1 month 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

Index: content/browser/browser_main_runner.cc

diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc

index 67263fe61128b75033f48c62c99e085e530c2145..ab548c6c06495bda8c2cd016b173a9f1d9b6ce40 100644

--- a/content/browser/browser_main_runner.cc

+++ b/content/browser/browser_main_runner.cc

@@ -293,7 +293,8 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {

// Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring

// proper shutdown for content_browsertests. Shutdown() is not used by

// the actual browser.

- base::MessageLoop::current()->QuitNow();

+ if (base::MessageLoop::current()->is_running())

+ base::MessageLoop::current()->QuitNow();

#endif

main_loop_.reset(NULL);

« no previous file with comments | « no previous file | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | no next file with comments »