content/browser/android/browser_jni_registrar.cc - Issue 731133002: Upstream ResourceManager

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 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build failure 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:

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 e36320ce0be6a4f5f5db1816098b6c8a596d0e7b..f35e96c0559d711bbdd56a03159c73d6c182b5c3 100644

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

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

@@ -22,6 +22,7 @@

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

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

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

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

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

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

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

@@ -83,6 +84,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {

content::PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable},

{"PowerSaveBlock", content::RegisterPowerSaveBlocker},

{"RegisterImeAdapter", content::RegisterImeAdapter},

+ {"ResourceManager", content::ResourceManagerImpl::RegisterResourceManager},

{"ScreenOrientationProvider",

content::ScreenOrientationDelegateAndroid::Register},

{"SensorManagerAndroid", content::SensorManagerAndroid::Register},