[Mac] Use chrome_native_app_window_views when mac_views_browser is enabled.

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

 // Copyright 2014 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/apps/chrome_native_app_window_views.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ skipping 248 matching lines @@
     else
       widget()->SetBounds(window_bounds);
   }
 
   if (IsFrameless() &&
       init_params.opacity == views::Widget::InitParams::TRANSLUCENT_WINDOW) {
     // The given window is most likely not rectangular since it uses
     // 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)
   if (create_params.is_ime_window)
     return;
 #endif
 
   // Register accelarators supported by app windows.
   // TODO(jeremya/stevenjb): should these be registered for panels too?
   views::FocusManager* focus_manager = GetFocusManager();
@@ skipping 328 matching lines @@
     // specific, and lift this restriction.
     if (icon->Width() != icon->Height()) {
       LOG(ERROR) << "Attempt to set a non-square badge; request ignored.";
       return;
     }
   }
   chrome::DrawTaskbarDecoration(GetNativeWindow(), icon);
 }
 
 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_));
     if (!had_shape) {
       native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
           new ShapedAppWindowTargeter(native_window, this)));
     }
   } else {
     widget()->SetShape(NULL);
     if (had_shape)
       native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>());
   }
+#endif
   widget()->OnSizeConstraintsChanged();
 }
 
 bool ChromeNativeAppWindowViews::HasFrameColor() const {
   return has_frame_color_;
 }
 
 SkColor ChromeNativeAppWindowViews::ActiveFrameColor() const {
   return active_frame_color_;
 }
@@ skipping 44 matching lines @@
 #if defined(USE_ASH)
   // For Aura windows on the Ash desktop the sizes are different and the user
   // can resize the window from slightly outside the bounds as well.
   if (chrome::IsNativeWindowInAsh(widget()->GetNativeWindow())) {
     frame->SetResizeSizes(ash::kResizeInsideBoundsSize,
                           ash::kResizeOutsideBoundsSize,
                           ash::kResizeAreaCornerSize);
   }
 #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()) !=
       chrome::HOST_DESKTOP_TYPE_ASH) {
     aura::Window* window = widget()->GetNativeWindow();
     int resize_inside = frame->resize_inside_bounds_size();
     gfx::Insets inset(
         resize_inside, resize_inside, resize_inside, resize_inside);
     // Add the EasyResizeWindowTargeter on the window, not its root window. The
     // root window does not have a delegate, which is needed to handle the event
     // in Linux.
     window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
         new wm::EasyResizeWindowTargeter(window, inset, inset)));
   }
 #endif
 
   return frame;
 }