MacViews: Get chrome/browser/ui/views/frame to compile (reland)

chrome/browser/ui/views/frame/contents_web_view.cc

Index: chrome/browser/ui/views/frame/contents_web_view.cc
diff --git a/chrome/browser/ui/views/frame/contents_web_view.cc b/chrome/browser/ui/views/frame/contents_web_view.cc
index 28ed10c2fbc58909828119e1860dce4508d876c7..9320941b7eaec3247333e3cd1aea6b7f2c0f2158 100644
--- a/chrome/browser/ui/views/frame/contents_web_view.cc
+++ b/chrome/browser/ui/views/frame/contents_web_view.cc
@@ -7,11 +7,14 @@
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/status_bubble_views.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/aura/window.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/views/background.h"
+
+#if defined(USE_AURA)
+#include "ui/aura/window.h"
 #include "ui/wm/core/window_util.h"
+#endif
 
 ContentsWebView::ContentsWebView(content::BrowserContext* browser_context)
     : views::WebView(browser_context),
@@ -83,7 +86,11 @@ void ContentsWebView::OnLayerRecreated(ui::Layer* old_layer,
 void ContentsWebView::CloneWebContentsLayer() {
   if (!web_contents())
     return;
+#if defined(USE_AURA)
+  // We don't need to clone the layers on non-Aura (Mac), because closing an
+  // NSWindow does not animate.
   cloned_layer_tree_ = wm::RecreateLayers(web_contents()->GetNativeView());
+#endif
   if (!cloned_layer_tree_ || !cloned_layer_tree_->root()) {
     cloned_layer_tree_.reset();
     return;