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