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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1493 // associated with the window, but just in case. | 1493 // associated with the window, but just in case. |
1494 DetachFromInputMethod(); | 1494 DetachFromInputMethod(); |
1495 } | 1495 } |
1496 | 1496 |
1497 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { | 1497 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
1498 const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint(); | 1498 const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint(); |
1499 aura::RootWindow* root_window = window_->GetRootWindow(); | 1499 aura::RootWindow* root_window = window_->GetRootWindow(); |
1500 if (!root_window) | 1500 if (!root_window) |
1501 return; | 1501 return; |
1502 | 1502 |
1503 if (root_window->GetEventHandlerForPoint(screen_point) != window_) | 1503 if (root_window->GetEventHandlerForPoint(screen_point, |
| 1504 ui::ET_MOUSE_MOVED) != window_) |
1504 return; | 1505 return; |
1505 | 1506 |
1506 gfx::NativeCursor cursor = current_cursor_.GetNativeCursor(); | 1507 gfx::NativeCursor cursor = current_cursor_.GetNativeCursor(); |
1507 if (is_loading_) | 1508 if (is_loading_) |
1508 cursor = ui::kCursorPointer; | 1509 cursor = ui::kCursorPointer; |
1509 | 1510 |
1510 root_window->SetCursor(cursor); | 1511 root_window->SetCursor(cursor); |
1511 } | 1512 } |
1512 | 1513 |
1513 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { | 1514 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1656 RenderWidgetHost* widget) { | 1657 RenderWidgetHost* widget) { |
1657 return new RenderWidgetHostViewAura(widget); | 1658 return new RenderWidgetHostViewAura(widget); |
1658 } | 1659 } |
1659 | 1660 |
1660 // static | 1661 // static |
1661 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 1662 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
1662 GetScreenInfoForWindow(results, NULL); | 1663 GetScreenInfoForWindow(results, NULL); |
1663 } | 1664 } |
1664 | 1665 |
1665 } // namespace content | 1666 } // namespace content |
OLD | NEW |