Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1245)

Side by Side Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 415343002: Upstream accessibility font size preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: brackets of return statement Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/chrome_jni_registrar.h" 5 #include "chrome/browser/android/chrome_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/accessibility/font_size_prefs_android.h"
10 #include "chrome/browser/android/accessibility_util.h" 11 #include "chrome/browser/android/accessibility_util.h"
11 #include "chrome/browser/android/banners/app_banner_manager.h" 12 #include "chrome/browser/android/banners/app_banner_manager.h"
12 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 13 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
13 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 14 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
14 #include "chrome/browser/android/chromium_application.h" 15 #include "chrome/browser/android/chromium_application.h"
15 #include "chrome/browser/android/content_view_util.h" 16 #include "chrome/browser/android/content_view_util.h"
16 #include "chrome/browser/android/dev_tools_server.h" 17 #include "chrome/browser/android/dev_tools_server.h"
17 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h" 18 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
18 #include "chrome/browser/android/favicon_helper.h" 19 #include "chrome/browser/android/favicon_helper.h"
19 #include "chrome/browser/android/foreign_session_helper.h" 20 #include "chrome/browser/android/foreign_session_helper.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, 132 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register },
132 { "DevToolsServer", RegisterDevToolsServer }, 133 { "DevToolsServer", RegisterDevToolsServer },
133 { "DomDistillerServiceFactory", 134 { "DomDistillerServiceFactory",
134 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, 135 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},
135 { "DomDistillerTabUtils", RegisterDomDistillerTabUtils }, 136 { "DomDistillerTabUtils", RegisterDomDistillerTabUtils },
136 { "ExternalPrerenderRequestHandler", 137 { "ExternalPrerenderRequestHandler",
137 prerender::ExternalPrerenderHandlerAndroid:: 138 prerender::ExternalPrerenderHandlerAndroid::
138 RegisterExternalPrerenderHandlerAndroid }, 139 RegisterExternalPrerenderHandlerAndroid },
139 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, 140 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
140 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter }, 141 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter },
142 { "FontSizePrefsAndroid", FontSizePrefsAndroid::Register},
robliao 2014/08/01 17:36:33 Add space after register
sunangel 2014/08/04 16:37:57 Done.
141 { "ForeignSessionHelper", 143 { "ForeignSessionHelper",
142 ForeignSessionHelper::RegisterForeignSessionHelper }, 144 ForeignSessionHelper::RegisterForeignSessionHelper },
143 { "InfoBarContainer", RegisterInfoBarContainer }, 145 { "InfoBarContainer", RegisterInfoBarContainer },
144 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, 146 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },
145 { "IntentHelper", RegisterIntentHelper }, 147 { "IntentHelper", RegisterIntentHelper },
146 { "InvalidationController", invalidation::RegisterInvalidationController }, 148 { "InvalidationController", invalidation::RegisterInvalidationController },
147 { "JavascriptAppModalDialog", 149 { "JavascriptAppModalDialog",
148 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 150 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
149 { "LogoBridge", RegisterLogoBridge }, 151 { "LogoBridge", RegisterLogoBridge },
150 { "MostVisitedSites", MostVisitedSites::Register }, 152 { "MostVisitedSites", MostVisitedSites::Register },
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 }; 190 };
189 191
190 bool RegisterJni(JNIEnv* env) { 192 bool RegisterJni(JNIEnv* env) {
191 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 193 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
192 return RegisterNativeMethods(env, kChromeRegisteredMethods, 194 return RegisterNativeMethods(env, kChromeRegisteredMethods,
193 arraysize(kChromeRegisteredMethods)); 195 arraysize(kChromeRegisteredMethods));
194 } 196 }
195 197
196 } // namespace android 198 } // namespace android
197 } // namespace chrome 199 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698