Revert 123830 - Aura: Support hovering restore & close buttons for full screen apps.

BUG=None
TEST=None

Review URL: https://chromiumcodereview.appspot.com/9359022

TBR=davemoore@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9480013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123837 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 14 deletions

diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 7874f0f..6dad002 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -174,10 +174,6 @@
         <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_BOTTOM_LEFT" file="aura/window_bottom_left.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_BOTTOM_RIGHT" file="aura/window_bottom_right.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="aura/window_fullscreen_shadow.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_TOP_LEFT" file="aura/window_top_left.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_TOP_RIGHT" file="aura/window_top_right.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" type="BINDATA" />
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index dc01169..05d4997 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -215,6 +215,8 @@ NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() {
 }
 
 void NativeWidgetAura::UpdateFrameAfterFrameChange() {
+  // We don't support changing the frame type.
+  NOTREACHED();
 }
 
 bool NativeWidgetAura::ShouldUseNativeFrame() const {
diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc
index 9d37b5f..c880414 100644
--- a/ui/views/window/non_client_view.cc
+++ b/ui/views/window/non_client_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -168,15 +168,10 @@ views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) {
   // detect this condition and re-route the events to the non-client frame view.
   // The assumption is that the frame view's implementation of HitTest will only
   // return true for area not occupied by the client view.
-  if (frame_view_->parent() == this) {
-    // During the reset of the frame_view_ it's possible to be in this code
-    // after it's been removed from the view hierarchy but before it's been
-    // removed from the NonClientView.
-    gfx::Point point_in_child_coords(point);
-    View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
-    if (frame_view_->HitTest(point_in_child_coords))
-      return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
-  }
+  gfx::Point point_in_child_coords(point);
+  View::ConvertPointToView(this, frame_view_.get(), &point_in_child_coords);
+  if (frame_view_->HitTest(point_in_child_coords))
+    return frame_view_->GetEventHandlerForPoint(point_in_child_coords);
 
   return View::GetEventHandlerForPoint(point);
 }