Remove non USE_AURA code from views files.

ui/app_list/views/app_list_view.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 "ui/app_list/views/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/signin_delegate.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_background.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view_observer.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
 #include "ui/app_list/views/speech_view.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/bubble/bubble_window_targeter.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
+
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
-#endif  // defined(USE_AURA)
 
 namespace app_list {
 
 namespace {
 
 void (*g_next_paint_callback)();
 
 // The margin from the edge to the speech UI.
 const int kSpeechUIMargin = 12;
 
@@ skipping 184 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 // static
 void AppListView::SetNextPaintCallback(void (*callback)()) {
   g_next_paint_callback = callback;
 }
 
 #if defined(OS_WIN)
 HWND AppListView::GetHWND() const {
-#if defined(USE_AURA)
   gfx::NativeWindow window =
       GetWidget()->GetTopLevelWidget()->GetNativeWindow();
   return window->GetHost()->GetAcceleratedWidget();
-#else
-  return GetWidget()->GetTopLevelWidget()->GetNativeWindow();
-#endif
 }
 #endif
 
 void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
                                        PaginationModel* pagination_model,
                                        views::BubbleBorder::Arrow arrow,
                                        bool border_accepts_events,
                                        const gfx::Vector2d& anchor_offset) {
   app_list_main_view_ = new AppListMainView(delegate_.get(),
                                             pagination_model,
                                             parent);
   AddChildView(app_list_main_view_);
-#if defined(USE_AURA)
   app_list_main_view_->SetPaintToLayer(true);
   app_list_main_view_->SetFillsBoundsOpaquely(false);
   app_list_main_view_->layer()->SetMasksToBounds(true);
-#endif
 
   signin_view_ =
       new SigninView(delegate_->GetSigninDelegate(),
                      app_list_main_view_->GetPreferredSize().width());
   AddChildView(signin_view_);
 
   // Speech recognition is available only when the start page exists.
   if (delegate_ && delegate_->GetSpeechRecognitionContents()) {
     speech_view_ = new SpeechView(delegate_.get());
     speech_view_->SetVisible(false);
-#if defined(USE_AURA)
     speech_view_->SetPaintToLayer(true);
     speech_view_->SetFillsBoundsOpaquely(false);
     speech_view_->layer()->SetOpacity(0.0f);
-#endif
     AddChildView(speech_view_);
   }
 
   OnProfilesChanged();
   set_color(kContentsBackgroundColor);
   set_margins(gfx::Insets());
   set_move_with_anchor(true);
   set_parent_window(parent);
   set_close_on_deactivate(false);
   set_close_on_esc(false);
   set_anchor_view_insets(gfx::Insets(kArrowOffset + anchor_offset.y(),
                                      kArrowOffset + anchor_offset.x(),
                                      kArrowOffset - anchor_offset.y(),
                                      kArrowOffset - anchor_offset.x()));
   set_border_accepts_events(border_accepts_events);
   set_shadow(SupportsShadow() ? views::BubbleBorder::BIG_SHADOW
                               : views::BubbleBorder::NO_SHADOW_OPAQUE_BORDER);
   views::BubbleDelegateView::CreateBubble(this);
   SetBubbleArrow(arrow);
 
-#if defined(USE_AURA)

[tapted, 2014/04/23 23:38:09]

I think this and one below were the only USE_AURA #ifdefs I was keeping around
in the app_list code, but I can bring it back after poking around for
alternatives.

   aura::Window* window = GetWidget()->GetNativeWindow();
   window->layer()->SetMasksToBounds(true);
   GetBubbleFrameView()->set_background(new AppListBackground(
       GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius(),
       app_list_main_view_));
   set_background(NULL);
   window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
       new views::BubbleWindowTargeter(this)));
-#else
-  set_background(new AppListBackground(
-      GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius(),
-      app_list_main_view_));
-
-  // On non-aura the bubble has two widgets, and it's possible for the border
-  // to be shown independently in odd situations. Explicitly hide the bubble
-  // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the
-  // window manager do not have the SWP_SHOWWINDOW flag set which would cause
-  // the border to be shown. See http://crbug.com/231687 .
-  GetWidget()->Hide();
-#endif
 
   if (delegate_)
     delegate_->ViewInitialized();
 }
 
 void AppListView::OnBeforeBubbleWidgetInit(
     views::Widget::InitParams* params,
     views::Widget* widget) const {
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)

[tapted, 2014/04/23 23:38:09]

mac-views won't like this either :)

+#if !defined(OS_CHROMEOS)
   if (delegate_ && delegate_->ForceNativeDesktop())
     params->native_widget = new views::DesktopNativeWidgetAura(widget);
 #endif
 #if defined(OS_WIN)
   // Windows 7 and higher offer pinning to the taskbar, but we need presence
   // on the taskbar for the user to be able to pin us. So, show the window on
   // the taskbar for these versions of Windows.
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     params->force_show_in_taskbar = true;
 #elif defined(OS_LINUX)
@@ skipping 109 matching lines @@
 
   bool recognizing = (new_state == SPEECH_RECOGNITION_RECOGNIZING ||
                       new_state == SPEECH_RECOGNITION_IN_SPEECH);
   // No change for this class.
   if (speech_view_->visible() == recognizing)
     return;
 
   if (recognizing)
     speech_view_->Reset();
 
-#if defined(USE_AURA)
   animation_observer_->set_frame(GetBubbleFrameView());
   gfx::Transform speech_transform;
   speech_transform.Translate(
       0, SkFloatToMScalar(kSpeechUIAppearingPosition));
   if (recognizing)
     speech_view_->layer()->SetTransform(speech_transform);
 
   {
     ui::ScopedLayerAnimationSettings main_settings(
         app_list_main_view_->layer()->GetAnimator());
@@ skipping 16 matching lines @@
     if (recognizing)
       speech_view_->layer()->SetTransform(gfx::Transform());
     else
       speech_view_->layer()->SetTransform(speech_transform);
   }
 
   if (recognizing)
     speech_view_->SetVisible(true);
   else
     app_list_main_view_->SetVisible(true);
-#else
-  speech_view_->SetVisible(recognizing);
-  app_list_main_view_->SetVisible(!recognizing);
-
-  // Needs to schedule paint of AppListView itself, to repaint the background.
-  GetBubbleFrameView()->SchedulePaint();
-#endif
 }
 
 }  // namespace app_list