content/browser/android/browser_jni_registrar.cc - Issue 22272006: Add support for multiple asynchronous browser startups.

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/android/browser_jni_registrar.cc

Issue 22272006: Add support for multiple asynchronous browser startups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merged BrowserStartupConfig and BrowserStartupController. Rebased. Updated ContentShellActivity to … Created 7 years, 4 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

« chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java ('K') | « chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java ('k') | content/browser/android/browser_startup_config.h » ('j') | content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/browser_jni_registrar.cc

diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc

index 35da3af3f3f8193ac18c2970a6003515c7654f72..5e7940d048c94f6d809f73820fa9232e02b501da 100644

--- a/content/browser/android/browser_jni_registrar.cc

+++ b/content/browser/android/browser_jni_registrar.cc

@@ -9,7 +9,7 @@

#include "content/browser/accessibility/browser_accessibility_android.h"

#include "content/browser/accessibility/browser_accessibility_manager_android.h"

#include "content/browser/android/android_browser_process.h"

-#include "content/browser/android/browser_startup_config.h"

+#include "content/browser/android/browser_startup_controller.h"

#include "content/browser/android/child_process_launcher_android.h"

#include "content/browser/android/content_settings.h"

#include "content/browser/android/content_video_view.h"

@@ -42,7 +42,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {

{"AndroidBrowserProcess", content::RegisterAndroidBrowserProcess},

{"BrowserAccessibilityManager",

content::RegisterBrowserAccessibilityManager},

- {"BrowserStartupConfiguration", content::RegisterBrowserStartupConfig},

+ {"BrowserStartupController", content::RegisterBrowserStartupController},

{"ChildProcessLauncher", content::RegisterChildProcessLauncher},

{"ContentSettings", content::ContentSettings::RegisterContentSettings},

{"ContentViewRenderView",