NOT FOR REVIEW: Aura on Android

chrome/browser/android/chrome_application.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/chrome_application.h"
 
 #include <vector>
 
 #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"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ChromeApplication_jni.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #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 {
 
 void FlushCookiesOnIOThread(
     scoped_refptr<net::URLRequestContextGetter> getter) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   getter->GetURLRequestContext()
       ->cookie_store()
       ->GetCookieMonster()
@@ skipping 73 matching lines @@
 }
 
 namespace chrome {
 namespace android {
 
 // static
 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() {
   return Java_ChromeApplication_areParentalControlsEnabled(
       base::android::AttachCurrentThread(),
       base::android::GetApplicationContext());
 }
 
 }  // namespace android
 }  // namespace chrome