Removing the code added to make chrome compile on Aura Android.

BUG=NONE

Review URL: https://codereview.chromium.org/1560503002

Cr-Commit-Position: refs/heads/master@{#371624}

chrome/app/generated_resources.grd

@@ -494,8 +494,8 @@ are declared in build/common.gypi.
         Right to Left
       </message>
 
-      <!-- content area context menus. -->
-      <if expr="not is_android or use_aura">
+       <!-- content area context menus. Android does not use it -->
+      <if expr="not is_android">
         <message name="IDS_CONTENT_CONTEXT_INSPECTELEMENT" desc="The name of the Inspect Element command in the content area context menu">
           I&amp;nspect
         </message>
@@ -9289,8 +9289,8 @@ I don't think this site should be blocked!
         Platform
       </message>
 
-      <!-- chrome://settings. Non-Aura Android uses native UI for settings -->
-      <if expr="not is_android or use_aura">
+      <!-- chrome://settings. Android uses native UI for settings -->
+      <if expr="not is_android">
         <if expr="chromeos">
           <message name="IDS_OPTIONS_INTERNET_TAB_LABEL" desc="The title of the Internet tab">
             Internet
@@ -13262,7 +13262,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
       </if>
 
       <!-- Media Galleries. -->
-      <if expr="not is_android or use_aura">
+      <if expr="not is_android">
         <message name="IDS_MEDIA_GALLERIES_DIALOG_HEADER" desc="Header for media gallery permissions dialog.">
           Media-File Permissions for "<ph name="EXTENSION">$1<ex>Photo Editor</ex></ph>"
         </message>

chrome/browser/media_galleries/android/mtp_device_delegate_impl_android.cc

-// Copyright 2015 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/media_galleries/fileapi/mtp_device_async_delegate.h"
-
-void CreateMTPDeviceAsyncDelegate(
-    const std::string& device_location,
-    const bool read_only,
-    const CreateMTPDeviceAsyncDelegateCallback& callback) {
-  // Return nullptr as there is no MTPDeviceAsyncDelegate implementation for
-  // Chrome on Android at the moment.
-  // TODO(crbug.com/560390): Add an MTPDeviceAsyncDelegate implementation on
-  // Android.
-  NOTIMPLEMENTED();
-  callback.Run(nullptr);
-}

chrome/browser/media_galleries/media_folder_finder.cc

@@ -61,9 +61,6 @@ const int kPrunedPaths[] = {
 #if defined(OS_WIN) || defined(OS_LINUX)
   base::DIR_TEMP,
 #endif
-#if defined(OS_ANDROID)
-  base::DIR_ANDROID_APP_DATA,
-#endif
 };
 
 bool IsValidScanPath(const base::FilePath& path) {

chrome/browser/ui/browser_navigator_params.cc

@@ -9,7 +9,7 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #endif
@@ -20,7 +20,7 @@ using content::WebContents;
 
 namespace chrome {
 
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
 namespace {
 
 HostDesktopType GetHostDesktop(Browser* browser) {
@@ -53,9 +53,7 @@ NavigateParams::NavigateParams(WebContents* a_target_contents)
       should_replace_current_entry(false),
       created_with_opener(false) {
 }
-#endif  // defined(OS_ANDROID)
-
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#else
 NavigateParams::NavigateParams(Browser* a_browser,
                                const GURL& a_url,
                                ui::PageTransition a_transition)
@@ -103,7 +101,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
       should_replace_current_entry(false),
       created_with_opener(false) {
 }
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif  // !defined(OS_ANDROID)
 
 NavigateParams::NavigateParams(Profile* a_profile,
                                const GURL& a_url,
@@ -123,7 +121,7 @@ NavigateParams::NavigateParams(Profile* a_profile,
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
       browser(NULL),
 #endif
       initiating_profile(a_profile),

chrome/browser/ui/browser_navigator_params.h

@@ -56,8 +56,7 @@ namespace chrome {
 struct NavigateParams {
 #if defined(OS_ANDROID)
   explicit NavigateParams(content::WebContents* a_target_contents);
-#endif
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#else
   NavigateParams(Browser* browser,
                  const GURL& a_url,
                  ui::PageTransition a_transition);
@@ -207,7 +206,7 @@ struct NavigateParams {
   // Default is IGNORE.
   RefBehavior ref_behavior;
 
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // [in]  Specifies a Browser object where the navigation could occur or the
   //       tab could be added. Navigate() is not obliged to use this Browser if
   //       it is not compatible with the operation being performed. This can be

chrome/browser/ui/views/frame/browser_frame_android.cc

-// Copyright 2015 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/ui/views/frame/browser_frame_android.h"
-
-#include "chrome/browser/ui/views/frame/browser_shutdown.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host_platform.h"
-
-///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAndroid, public:
-
-// static
-const char BrowserFrameAndroid::kWindowName[] = "BrowserFrameAndroid";
-
-namespace {
-// |g_host| should be set before browser frame instantiation. It is used to get
-// the window which is needed for creating the widget for the browser frame.
-// TODO(moshayedi): crbug.com/551055. This is temporary until we have
-// multi-window support.
-aura::WindowTreeHostPlatform* g_host = nullptr;
-}
-
-BrowserFrameAndroid::BrowserFrameAndroid(BrowserFrame* browser_frame,
-                                         BrowserView* browser_view)
-    : views::NativeWidgetAura(browser_frame), browser_view_(browser_view) {
-  GetNativeWindow()->SetName(kWindowName);
-}
-
-// static
-void BrowserFrameAndroid::SetHost(aura::WindowTreeHostPlatform* host) {
-  g_host = host;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAndroid, views::NativeWidgetAura overrides:
-
-void BrowserFrameAndroid::OnWindowDestroying(aura::Window* window) {
-  // Destroy any remaining WebContents early on. Doing so may result in
-  // calling back to one of the Views/LayoutManagers or supporting classes of
-  // BrowserView. By destroying here we ensure all said classes are valid.
-  DestroyBrowserWebContents(browser_view_->browser());
-  NativeWidgetAura::OnWindowDestroying(window);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAndroid, NativeBrowserFrame implementation:
-
-views::Widget::InitParams BrowserFrameAndroid::GetWidgetParams() {
-  DCHECK(g_host);
-
-  views::Widget::InitParams params;
-  params.native_widget = this;
-  params.context = g_host->window();
-  return params;
-}
-
-bool BrowserFrameAndroid::UseCustomFrame() const {
-  return true;
-}
-
-bool BrowserFrameAndroid::UsesNativeSystemMenu() const {
-  return false;
-}
-
-int BrowserFrameAndroid::GetMinimizeButtonOffset() const {
-  return 0;
-}
-
-bool BrowserFrameAndroid::ShouldSaveWindowPlacement() const {
-  return false;
-}
-
-void BrowserFrameAndroid::GetWindowPlacement(
-    gfx::Rect* bounds,
-    ui::WindowShowState* show_state) const {}
-
-BrowserFrameAndroid::~BrowserFrameAndroid() {}

chrome/browser/ui/views/frame/browser_frame_android.h

-// Copyright 2015 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.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_
-
-#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/views/frame/native_browser_frame.h"
-#include "ui/aura/window_tree_host_platform.h"
-#include "ui/views/widget/native_widget_aura.h"
-
-class BrowserFrame;
-class BrowserView;
-
-////////////////////////////////////////////////////////////////////////////////
-//  BrowserFrameAndroid
-//
-//  BrowserFrameAndroid is a NativeWidgetAura subclass that provides the window
-//  frame for the Chrome browser window.
-//
-class BrowserFrameAndroid : public views::NativeWidgetAura,
-                            public NativeBrowserFrame {
- public:
-  static const char kWindowName[];
-
-  BrowserFrameAndroid(BrowserFrame* browser_frame, BrowserView* browser_view);
-
-  BrowserView* browser_view() const { return browser_view_; }
-
-  // Must be called before the browser frame is created.
-  static void SetHost(aura::WindowTreeHostPlatform* host);
-
- protected:
-  // Overridden from views::NativeWidgetAura:
-  void OnWindowDestroying(aura::Window* window) override;
-
-  // Overridden from NativeBrowserFrame:
-  views::Widget::InitParams GetWidgetParams() override;
-  bool UseCustomFrame() const override;
-  bool UsesNativeSystemMenu() const override;
-  int GetMinimizeButtonOffset() const override;
-  bool ShouldSaveWindowPlacement() const override;
-  void GetWindowPlacement(gfx::Rect* bounds,
-                          ui::WindowShowState* show_state) const override;
-
-  ~BrowserFrameAndroid() override;
-
- private:
-  class WindowPropertyWatcher;
-
-  // The BrowserView is our ClientView. This is a pointer to it.
-  BrowserView* browser_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserFrameAndroid);
-};
-
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_

chrome/browser/ui/views/frame/native_browser_frame_factory_android.cc

-// Copyright 2015 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/ui/views/frame/native_browser_frame_factory.h"
-
-#include "chrome/browser/ui/views/frame/browser_frame_android.h"
-
-NativeBrowserFrame* NativeBrowserFrameFactory::Create(
-    BrowserFrame* browser_frame,
-    BrowserView* browser_view) {
-  return new BrowserFrameAndroid(browser_frame, browser_view);
-}

chrome/chrome_browser.gypi

@@ -1173,7 +1173,6 @@
       'browser/lifetime/browser_close_manager.h',
       'browser/media/native_desktop_media_list.cc',
       'browser/media/native_desktop_media_list.h',
-      'browser/media_galleries/android/mtp_device_delegate_impl_android.cc',
       'browser/media_galleries/fileapi/av_scanning_file_validator.cc',
       'browser/media_galleries/fileapi/av_scanning_file_validator.h',
       'browser/media_galleries/fileapi/device_media_async_file_util.cc',

chrome/chrome_browser_ui.gypi

@@ -2244,8 +2244,6 @@
       'browser/ui/views/frame/browser_command_handler_linux.h',
       'browser/ui/views/frame/browser_frame.cc',
       'browser/ui/views/frame/browser_frame.h',
-      'browser/ui/views/frame/browser_frame_android.cc',
-      'browser/ui/views/frame/browser_frame_android.h',
       'browser/ui/views/frame/browser_frame_common_win.cc',
       'browser/ui/views/frame/browser_frame_common_win.h',
       'browser/ui/views/frame/browser_frame_mac.h',
@@ -2283,7 +2281,6 @@
       'browser/ui/views/frame/native_browser_frame.h',
       'browser/ui/views/frame/native_browser_frame_factory.cc',
       'browser/ui/views/frame/native_browser_frame_factory.h',
-      'browser/ui/views/frame/native_browser_frame_factory_android.cc',
       'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
       'browser/ui/views/frame/native_browser_frame_factory_mac.mm',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',