Remove more ifdefs and TODOs that were added for Aura Android

chrome/browser/ui/views/chrome_views_delegate.cc

 // Copyright (c) 2012 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/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
@@ skipping 35 matching lines @@
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
-#if defined(OS_ANDROID)
-#include "ui/views/widget/android/native_widget_android.h"
-#endif
-
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #endif
 
 // Helpers --------------------------------------------------------------------
 
@@ skipping 356 matching lines @@
                                              parent_profile);
     }
     params->native_widget = native_widget;
   } else {
     // TODO(erg): Once we've threaded context to everywhere that needs it, we
     // should remove this check here.
     gfx::NativeView to_check =
         params->context ? params->context : params->parent;
     if (chrome::GetHostDesktopTypeForNativeView(to_check) ==
         chrome::HOST_DESKTOP_TYPE_NATIVE) {
-#if defined(OS_ANDROID)
-      params->native_widget = new views::NativeWidgetAndroid(delegate);
-#else
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
-#endif
     }
   }
 #endif
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
   // On Ubuntu Unity, the system always provides a title bar for maximized
   // windows.
   views::LinuxUI* ui = views::LinuxUI::instance();
@@ skipping 54 matching lines @@
   return content::BrowserThread::GetBlockingPool();
 }
 
 #if !defined(USE_ASH)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif