Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / android / chromium_application.cc

diff --git a/src/chrome/browser/android/chromium_application.cc b/src/chrome/browser/android/chromium_application.cc
index ff77aa5..d0f5b80 100644 (file)
--- a/src/chrome/browser/android/chromium_application.cc
+++ b/src/chrome/browser/android/chromium_application.cc
@@ -5,8 +5,18 @@
 #include "chrome/browser/android/chromium_application.h"
 
 #include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "chrome/browser/android/tab_android.h"
+#include "chrome/common/chrome_content_client.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ChromiumApplication_jni.h"
 
+using base::android::ConvertUTF8ToJavaString;
+
+static jstring GetBrowserUserAgent(JNIEnv* env, jclass clazz) {
+  return ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
+}
+
 namespace chrome {
 namespace android {
 
@@ -27,12 +37,34 @@ void ChromiumApplication::ShowSyncSettings() {
       base::android::GetApplicationContext());
 }
 
+void ChromiumApplication::ShowAutofillSettings() {
+  Java_ChromiumApplication_showAutofillSettings(
+      base::android::AttachCurrentThread(),
+      base::android::GetApplicationContext());
+}
+
+void ChromiumApplication::ShowPasswordSettings() {
+  Java_ChromiumApplication_showPasswordSettings(
+      base::android::AttachCurrentThread(),
+      base::android::GetApplicationContext());
+}
+
 void ChromiumApplication::ShowTermsOfServiceDialog() {
   Java_ChromiumApplication_showTermsOfServiceDialog(
       base::android::AttachCurrentThread(),
       base::android::GetApplicationContext());
 }
 
+void ChromiumApplication::OpenClearBrowsingData(
+    content::WebContents* web_contents) {
+  TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
+  DCHECK(tab);
+  Java_ChromiumApplication_openClearBrowsingData(
+      base::android::AttachCurrentThread(),
+      base::android::GetApplicationContext(),
+      tab->GetJavaObject().obj());
+}
+
 bool ChromiumApplication::AreParentalControlsEnabled() {
   return Java_ChromiumApplication_areParentalControlsEnabled(
       base::android::AttachCurrentThread(),