Revert "MacViews: Get chrome/browser/ui/views/frame to compile"

chrome/browser/ui/views/frame/contents_web_view.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/frame/contents_web_view.h"
 
 #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),
       status_bubble_(NULL) {
 }
 
 ContentsWebView::~ContentsWebView() {
 }
 
 void ContentsWebView::SetStatusBubble(StatusBubbleViews* status_bubble) {
@@ skipping 51 matching lines @@
   // want the WebContents layer clone to be animated we move it to the
   // old_layer, which is the layer the animation happens on. This animation ends
   // up owning the layer (and all its descendants).
   old_layer->Add(cloned_layer_tree_->release());
   cloned_layer_tree_.reset();
 }
 
 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;
   }
 
   SetPaintToLayer(true);
   set_layer_owner_delegate(this);
 
   // The cloned layer is in a different coordinate system them our layer (which
   // is now the new parent of the cloned layer). Convert coordinates so that the
   // cloned layer appears at the right location.
   gfx::Point origin;
   ui::Layer::ConvertPointToLayer(cloned_layer_tree_->root(), layer(), &origin);
   cloned_layer_tree_->root()->SetBounds(
       gfx::Rect(origin, cloned_layer_tree_->root()->bounds().size()));
   layer()->Add(cloned_layer_tree_->root());
 }
 
 void ContentsWebView::DestroyClonedLayer() {
   cloned_layer_tree_.reset();
   SetPaintToLayer(false);
   set_layer_owner_delegate(NULL);
 }