MacViews: views_examples_with_content_exe working!

ui/app_list/views/app_list_view.cc

Index: ui/app_list/views/app_list_view.cc
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index 7857271768cc3a70e5e547a038d37ae606946ccc..4c8bc5bf7d54169456a36494a2b8a1d2a1f6194e 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -33,7 +33,6 @@
 #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"
@@ -41,6 +40,7 @@
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/views/bubble/bubble_window_targeter.h"
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
@@ -254,13 +254,9 @@ void AppListView::SetNextPaintCallback(const base::Closure& 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
 
@@ -273,11 +269,9 @@ void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
                                             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(),
@@ -288,11 +282,9 @@ void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
   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_);
   }
 
@@ -471,7 +463,6 @@ void AppListView::OnSpeechRecognitionStateChanged(
   if (recognizing)
     speech_view_->Reset();
 
-#if defined(USE_AURA)
   animation_observer_->set_frame(GetBubbleFrameView());
   gfx::Transform speech_transform;
   speech_transform.Translate(
@@ -508,13 +499,6 @@ void AppListView::OnSpeechRecognitionStateChanged(
     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