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

Unified Diff: chrome/browser/prefs/incognito_mode_prefs.cc

Issue 2768023002: Move remaining @CalledByNative methods out of ChromeApplication. (Closed)
Patch Set: Created 3 years, 9 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: chrome/browser/prefs/incognito_mode_prefs.cc
diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
index 852698bf6f2e2740fb9d406cb7d9bd70ae64f384..21c607076d269c8c499574fcef4bd2f537098281 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -32,7 +32,8 @@
#endif // OS_WIN
#if defined(OS_ANDROID)
-#include "chrome/browser/android/chrome_application.h"
+#include "base/android/jni_android.h"
+#include "jni/PartnerBrowserCustomizations_jni.h"
Bernhard Bauer 2017/03/27 10:09:40 Including JNI headers in arbitrary .cc files is a
estevenson 2017/03/27 20:03:53 Done.
#endif // defined(OS_ANDROID)
using content::BrowserThread;
@@ -213,7 +214,8 @@ bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
#if defined(OS_WIN)
return PlatformParentalControlsValue::GetInstance()->is_enabled();
#elif defined(OS_ANDROID)
- return chrome::android::ChromeApplication::AreParentalControlsEnabled();
+ return Java_PartnerBrowserCustomizations_areParentalControlsEnabled(
+ base::android::AttachCurrentThread());
#else
return false;
#endif

Powered by Google App Engine
This is Rietveld 408576698