Revert 284177 "Make NativeViewHostAura clipping window non-focus..."

trunk/src/ui/views/controls/native/native_view_host_aura.cc

 // Copyright (c) 2012 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 "ui/views/controls/native/native_view_host_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_delegate.h"
 #include "ui/base/cursor/cursor.h"
-#include "ui/base/hit_test.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
-class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate {
- public:
-  explicit ClippingWindowDelegate(const NativeViewHost* host) : host_(host) {}
-  virtual ~ClippingWindowDelegate() {}
-
-  virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); }
-  virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); }
-  virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
-                               const gfx::Rect& new_bounds) OVERRIDE {}
-  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
-    return gfx::kNullCursor;
-  }
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
-    return HTCLIENT;
-  }
-  virtual bool ShouldDescendIntoChildForEventHandling(
-      aura::Window* child,
-      const gfx::Point& location) OVERRIDE { return true; }
-  virtual bool CanFocus() OVERRIDE {
-    // Ask the hosted native view's delegate because directly calling
-    // aura::Window::CanFocus() will call back into this when checking whether
-    // parents can focus.
-    return host_->native_view() && host_->native_view()->delegate()
-        ? host_->native_view()->delegate()->CanFocus()
-        : true;
-  }
-  virtual void OnCaptureLost() OVERRIDE {}
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {}
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {}
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {}
-  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
-  virtual bool HasHitTestMask() const OVERRIDE { return false; }
-  virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
-
- private:
-  const NativeViewHost* host_;
-};
-
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
-      clipping_window_delegate_(new ClippingWindowDelegate(host)),
-      clipping_window_(clipping_window_delegate_.get()) {
+      clipping_window_(NULL) {
   clipping_window_.Init(aura::WINDOW_LAYER_NOT_DRAWN);
   clipping_window_.set_owned_by_parent(false);
   clipping_window_.SetName("NativeViewHostAuraClip");
   clipping_window_.layer()->SetMasksToBounds(true);
   clipping_window_.SetProperty(views::kHostViewKey, static_cast<View*>(host_));
 }
 
 NativeViewHostAura::~NativeViewHostAura() {
   if (host_->native_view()) {
     host_->native_view()->RemoveObserver(this);
@@ skipping 142 matching lines @@
     } else {
       clipping_window_.RemoveChild(host_->native_view());
     }
     host_->native_view()->SetBounds(clipping_window_.bounds());
   }
   if (clipping_window_.parent())
     clipping_window_.parent()->RemoveChild(&clipping_window_);
 }
 
 }  // namespace views