OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
785 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE { | 785 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE { |
786 if (window == view_->window_) | 786 if (window == view_->window_) |
787 return; | 787 return; |
788 | 788 |
789 window->RemoveObserver(this); | 789 window->RemoveObserver(this); |
790 UpdateConstrainedWindows(window); | 790 UpdateConstrainedWindows(window); |
791 } | 791 } |
792 | 792 |
793 virtual void OnWindowVisibilityChanged(aura::Window* window, | 793 virtual void OnWindowVisibilityChanged(aura::Window* window, |
794 bool visible) OVERRIDE { | 794 bool visible) OVERRIDE { |
795 if (window == view_->window_) | 795 if (window == view_->window_ || |
796 return; | 796 window->parent() == parent_ || |
797 | |
798 if (window->parent() == parent_ || | |
799 window->parent() == view_->window_->GetRootWindow()) { | 797 window->parent() == view_->window_->GetRootWindow()) { |
800 UpdateConstrainedWindows(NULL); | 798 UpdateConstrainedWindows(NULL); |
801 } | 799 } |
802 } | 800 } |
803 #endif | 801 #endif |
804 | 802 |
805 virtual void OnWindowParentChanged(aura::Window* window, | 803 virtual void OnWindowParentChanged(aura::Window* window, |
806 aura::Window* parent) OVERRIDE { | 804 aura::Window* parent) OVERRIDE { |
807 if (window != view_->window_) | 805 if (window != view_->window_) |
808 return; | 806 return; |
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1793 event.location(), | 1791 event.location(), |
1794 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), | 1792 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), |
1795 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 1793 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
1796 if (drag_dest_delegate_) | 1794 if (drag_dest_delegate_) |
1797 drag_dest_delegate_->OnDrop(); | 1795 drag_dest_delegate_->OnDrop(); |
1798 current_drop_data_.reset(); | 1796 current_drop_data_.reset(); |
1799 return ConvertFromWeb(current_drag_op_); | 1797 return ConvertFromWeb(current_drag_op_); |
1800 } | 1798 } |
1801 | 1799 |
1802 } // namespace content | 1800 } // namespace content |
OLD | NEW |