content/browser/android/browser_jni_registrar.cc - Issue 19957002: Run the later parts of startup as UI thread tasks

Unified Diff: content/browser/android/browser_jni_registrar.cc

Issue 19957002: Run the later parts of startup as UI thread tasks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 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

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 25e0c3b9260d80dc75a461e21ce3a22340411deb..91c4277f94c5c5feac96382bc4b92f51ad9e87e4 100644

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

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

@@ -9,6 +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/android_startup_observer.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"

@@ -36,37 +37,38 @@ using content::SurfaceTexturePeerBrowserImpl;

namespace {

base::android::RegistrationMethod kContentRegisteredMethods[] = {

- { "AndroidLocationApiAdapter",

- content::AndroidLocationApiAdapter::RegisterGeolocationService },

- { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },

- { "BrowserAccessibilityManager",

- content::RegisterBrowserAccessibilityManager },

- { "ChildProcessLauncher", content::RegisterChildProcessLauncher },

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

- { "ContentViewRenderView",

- content::ContentViewRenderView::RegisterContentViewRenderView },

- { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },

- { "ContentViewCore", content::RegisterContentViewCore },

- { "DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register },

- { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid },

- { "DownloadControllerAndroidImpl",

- content::DownloadControllerAndroidImpl::RegisterDownloadController },

- { "InterstitialPageDelegateAndroid",

- content::InterstitialPageDelegateAndroid

- ::RegisterInterstitialPageDelegateAndroid },

- { "MediaResourceGetterImpl",

- content::MediaResourceGetterImpl::RegisterMediaResourceGetter },

- { "LoadUrlParams", content::RegisterLoadUrlParams },

- { "PowerSaveBlock", content::RegisterPowerSaveBlocker },

- { "RegisterImeAdapter", content::RegisterImeAdapter },

- { "SpeechRecognizerImplAndroid",

- content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer },

- { "TouchPoint", content::RegisterTouchPoint },

- { "TracingIntentHandler", content::RegisterTracingIntentHandler },

- { "VibrationMessageFilter", content::VibrationMessageFilter::Register },

- { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },

- { "WebViewStatics", content::RegisterWebViewStatics },

-};

+ {"AndroidLocationApiAdapter",

+ content::AndroidLocationApiAdapter::RegisterGeolocationService},

+ {"AndroidBrowserProcess", content::RegisterAndroidBrowserProcess},

+ {"BrowserAccessibilityManager",

+ content::RegisterBrowserAccessibilityManager},

+ {"ChildProcessLauncher", content::RegisterChildProcessLauncher},

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

+ {"ContentViewRenderView",

+ content::ContentViewRenderView::RegisterContentViewRenderView},

+ {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},

+ {"ContentViewCore", content::RegisterContentViewCore},

+ {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register},

+ {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},

+ {"DownloadControllerAndroidImpl",

+ content::DownloadControllerAndroidImpl::RegisterDownloadController},

+ {"InterstitialPageDelegateAndroid",

+ content::InterstitialPageDelegateAndroid::

+ RegisterInterstitialPageDelegateAndroid},

+ {"MediaResourceGetterImpl",

+ content::MediaResourceGetterImpl::RegisterMediaResourceGetter},

+ {"LoadUrlParams", content::RegisterLoadUrlParams},

+ {"PowerSaveBlock", content::RegisterPowerSaveBlocker},

+ {"RegisterImeAdapter", content::RegisterImeAdapter},

+ {"SpeechRecognizerImplAndroid",

+ content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},

+ {"AndroidStartupObserver",

+ content::AndroidStartupObserver::RegisterStartupObserver},

aberent 2013/07/22 15:47:35 The only real change in this file.

+ {"TouchPoint", content::RegisterTouchPoint},

+ {"TracingIntentHandler", content::RegisterTracingIntentHandler},

+ {"VibrationMessageFilter", content::VibrationMessageFilter::Register},

+ {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid},

+ {"WebViewStatics", content::RegisterWebViewStatics}, };

aberent 2013/07/22 15:47:35 Reformatted by git cl format. Not sure why it is u

} // namespace

« no previous file with comments | « content/browser/android/android_startup_observer.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »