[Mac] Use chrome_native_app_window_views when mac_views_browser is enabled.

chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
index cf3624ec8db86604ad71f67e390a75edb7fd5f35..57431f11754c11194c970d23e0f270c67788f39d 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -266,7 +266,9 @@ void ChromeNativeAppWindowViews::InitializeDefaultWindow(
     // transparency and has no standard frame, don't show a shadow for it.
     // TODO(skuhne): If we run into an application which should have a shadow
     // but does not have, a new attribute has to be added.
+#if defined(USE_AURA)
     wm::SetShadowType(widget()->GetNativeWindow(), wm::SHADOW_TYPE_NONE);

[tapted, 2015/02/20 07:50:29]

I think we need a general fix for this.

Mac automatically removes the shadow when the window type is frameless, so I
guess this is already done. But there are cases we don't want that. E.g.
menus/combo boxes should have a shadow, which currently gets removed.

For consistency, we probably want [window_ setHasShadow:YES] for
NativeWidgetMac, and then either a way to set the window shadow through the
views::Widget interface, or some kind of utility class like

#include "ui/views/native_window_util.h"  (or maybe even ui/base..)

void RemoveShadow(gfx::NativeWindow window);

which has a _aura.cc file for aura and a _mac.cc file for mac.

[jackhou1, 2015/02/26 04:35:16]

Done.

+#endif
   }
 
 #if defined(OS_CHROMEOS)
@@ -615,9 +617,12 @@ void ChromeNativeAppWindowViews::UpdateBadgeIcon() {
 }
 
 void ChromeNativeAppWindowViews::UpdateShape(scoped_ptr<SkRegion> region) {
+#if defined(USE_AURA)

[tapted, 2015/02/20 07:50:30]

It's annoying... but I think we need to try to make a 

ChromeNativeAppWindowViewsAura

and a

ChromeNativeAppWindowViewsMac

We'll probably need a ChromeNativeAppWindowViewsMac at some point anyway

[jackhou1, 2015/02/26 04:35:16]

Done.

   bool had_shape = shape_;
+#endif
   shape_ = region.Pass();
 
+#if defined(USE_AURA)
   aura::Window* native_window = widget()->GetNativeWindow();
   if (shape_) {
     widget()->SetShape(new SkRegion(*shape_));
@@ -630,6 +635,7 @@ void ChromeNativeAppWindowViews::UpdateShape(scoped_ptr<SkRegion> region) {
     if (had_shape)
       native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>());
   }
+#endif
   widget()->OnSizeConstraintsChanged();
 }
 
@@ -694,7 +700,7 @@ ChromeNativeAppWindowViews::CreateNonStandardAppFrame() {
   }
 #endif
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA)

[tapted, 2015/02/20 07:50:30]

If this moves to ChromeNativeAppWindowAura the #ifdef (and the USE_ASH one
above) can probably just be removed. (ChromeOS never has desktop_type != ASH,
and it should still compile..).

There's probably some more USE_ASH mess in this file, so moving that and all the
aura dependencies out to ChromeNativeAppWindowAura is probably the best first
step before trying to get this compiling on Mac.

[jackhou1, 2015/02/26 04:35:16]

Done.

   // For non-Ash windows, install an easy resize window targeter, which ensures
   // that the root window (not the app) receives mouse events on the edges.
   if (chrome::GetHostDesktopTypeForNativeWindow(widget()->GetNativeWindow()) !=