NOT FOR REVIEW: Aura on Android

chrome/browser/android/chrome_application.cc

Index: chrome/browser/android/chrome_application.cc
diff --git a/chrome/browser/android/chrome_application.cc b/chrome/browser/android/chrome_application.cc
index afb12f6250ef932790067361eb53094328bc94c8..a9e7939800c0234c237195c3ef7764fba0255b6d 100644
--- a/chrome/browser/android/chrome_application.cc
+++ b/chrome/browser/android/chrome_application.cc
@@ -9,7 +9,6 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
@@ -26,6 +25,10 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+#if !defined(USE_AURA)
+#include "chrome/browser/android/tab_android.h"
+#endif
+
 using base::android::ConvertUTF8ToJavaString;
 
 namespace {
@@ -119,26 +122,28 @@ bool ChromeApplication::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-void ChromeApplication::ShowAutofillSettings() {
-  Java_ChromeApplication_showAutofillSettings(
-      base::android::AttachCurrentThread(),
-      base::android::GetApplicationContext());
-}
+//void ChromeApplication::ShowAutofillSettings() {
+//  Java_ChromeApplication_showAutofillSettings(
+//      base::android::AttachCurrentThread(),
+//      base::android::GetApplicationContext());
+//}
 
-void ChromeApplication::ShowPasswordSettings() {
-  Java_ChromeApplication_showPasswordSettings(
-      base::android::AttachCurrentThread(),
-      base::android::GetApplicationContext());
-}
+//void ChromeApplication::ShowPasswordSettings() {
+//  Java_ChromeApplication_showPasswordSettings(
+//      base::android::AttachCurrentThread(),
+//      base::android::GetApplicationContext());
+//}
 
 void ChromeApplication::OpenClearBrowsingData(
     content::WebContents* web_contents) {
+#if !defined(USE_AURA)
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
   DCHECK(tab);
   Java_ChromeApplication_openClearBrowsingData(
       base::android::AttachCurrentThread(),
       base::android::GetApplicationContext(),
       tab->GetJavaObject().obj());
+#endif
 }
 
 bool ChromeApplication::AreParentalControlsEnabled() {