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/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1787 // system modal dialog). This is particularly important if | 1787 // system modal dialog). This is particularly important if |
1788 // |popup_child_host_view_| has mouse capture. | 1788 // |popup_child_host_view_| has mouse capture. |
1789 if (popup_child_host_view_) | 1789 if (popup_child_host_view_) |
1790 popup_child_host_view_->Shutdown(); | 1790 popup_child_host_view_->Shutdown(); |
1791 } | 1791 } |
1792 } | 1792 } |
1793 | 1793 |
1794 //////////////////////////////////////////////////////////////////////////////// | 1794 //////////////////////////////////////////////////////////////////////////////// |
1795 // RenderWidgetHostViewAura, aura::WindowTreeHostObserver implementation: | 1795 // RenderWidgetHostViewAura, aura::WindowTreeHostObserver implementation: |
1796 | 1796 |
1797 void RenderWidgetHostViewAura::OnHostMoved(const aura::WindowTreeHost* host, | 1797 void RenderWidgetHostViewAura::OnHostMovedInPixels( |
1798 const gfx::Point& new_origin) { | 1798 const aura::WindowTreeHost* host, |
1799 TRACE_EVENT1("ui", "RenderWidgetHostViewAura::OnHostMoved", | 1799 const gfx::Point& new_origin_in_pixels) { |
1800 "new_origin", new_origin.ToString()); | 1800 TRACE_EVENT1("ui", "RenderWidgetHostViewAura::OnHostMovedInPixels", |
| 1801 "new_origin_in_pixels", new_origin_in_pixels.ToString()); |
1801 | 1802 |
1802 UpdateScreenInfo(window_); | 1803 UpdateScreenInfo(window_); |
1803 } | 1804 } |
1804 | 1805 |
1805 //////////////////////////////////////////////////////////////////////////////// | 1806 //////////////////////////////////////////////////////////////////////////////// |
1806 // RenderWidgetHostViewAura, private: | 1807 // RenderWidgetHostViewAura, private: |
1807 | 1808 |
1808 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() { | 1809 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() { |
1809 // Ask the RWH to drop reference to us. | 1810 // Ask the RWH to drop reference to us. |
1810 if (!is_guest_view_hack_) | 1811 if (!is_guest_view_hack_) |
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2387 | 2388 |
2388 void RenderWidgetHostViewAura::SetPopupChild( | 2389 void RenderWidgetHostViewAura::SetPopupChild( |
2389 RenderWidgetHostViewAura* popup_child_host_view) { | 2390 RenderWidgetHostViewAura* popup_child_host_view) { |
2390 popup_child_host_view_ = popup_child_host_view; | 2391 popup_child_host_view_ = popup_child_host_view; |
2391 event_handler_->SetPopupChild( | 2392 event_handler_->SetPopupChild( |
2392 popup_child_host_view, | 2393 popup_child_host_view, |
2393 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2394 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
2394 } | 2395 } |
2395 | 2396 |
2396 } // namespace content | 2397 } // namespace content |
OLD | NEW |