| 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/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 window->GetRootWindow()->children(); | 815 window->GetRootWindow()->children(); |
| 816 for (size_t i = 0; i < root_children.size(); ++i) { | 816 for (size_t i = 0; i < root_children.size(); ++i) { |
| 817 if (root_children[i] != view_->window_ && root_children[i] != parent_) | 817 if (root_children[i] != view_->window_ && root_children[i] != parent_) |
| 818 root_children[i]->RemoveObserver(this); | 818 root_children[i]->RemoveObserver(this); |
| 819 } | 819 } |
| 820 #endif | 820 #endif |
| 821 } | 821 } |
| 822 } | 822 } |
| 823 | 823 |
| 824 // Overridden RootWindowObserver: | 824 // Overridden RootWindowObserver: |
| 825 virtual void OnRootWindowHostMoved(const aura::RootWindow* root, | 825 virtual void OnWindowTreeHostMoved(const aura::RootWindow* root, |
| 826 const gfx::Point& new_origin) OVERRIDE { | 826 const gfx::Point& new_origin) OVERRIDE { |
| 827 TRACE_EVENT1("ui", | 827 TRACE_EVENT1("ui", |
| 828 "WebContentsViewAura::WindowObserver::OnRootWindowHostMoved", | 828 "WebContentsViewAura::WindowObserver::OnWindowTreeHostMoved", |
| 829 "new_origin", new_origin.ToString()); | 829 "new_origin", new_origin.ToString()); |
| 830 | 830 |
| 831 // This is for the desktop case (i.e. Aura desktop). | 831 // This is for the desktop case (i.e. Aura desktop). |
| 832 SendScreenRects(); | 832 SendScreenRects(); |
| 833 } | 833 } |
| 834 | 834 |
| 835 private: | 835 private: |
| 836 void SendScreenRects() { | 836 void SendScreenRects() { |
| 837 RenderWidgetHostImpl::From(view_->web_contents_->GetRenderViewHost())-> | 837 RenderWidgetHostImpl::From(view_->web_contents_->GetRenderViewHost())-> |
| 838 SendScreenRects(); | 838 SendScreenRects(); |
| (...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1722 event.location(), | 1722 event.location(), |
| 1723 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), | 1723 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), |
| 1724 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 1724 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
| 1725 if (drag_dest_delegate_) | 1725 if (drag_dest_delegate_) |
| 1726 drag_dest_delegate_->OnDrop(); | 1726 drag_dest_delegate_->OnDrop(); |
| 1727 current_drop_data_.reset(); | 1727 current_drop_data_.reset(); |
| 1728 return current_drag_op_; | 1728 return current_drag_op_; |
| 1729 } | 1729 } |
| 1730 | 1730 |
| 1731 } // namespace content | 1731 } // namespace content |
| OLD | NEW |