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 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1220 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { | 1220 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
1221 const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint(); | 1221 const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint(); |
1222 aura::RootWindow* root_window = window_->GetRootWindow(); | 1222 aura::RootWindow* root_window = window_->GetRootWindow(); |
1223 if (!root_window) | 1223 if (!root_window) |
1224 return; | 1224 return; |
1225 | 1225 |
1226 if (root_window->GetEventHandlerForPoint(screen_point) != window_) | 1226 if (root_window->GetEventHandlerForPoint(screen_point) != window_) |
1227 return; | 1227 return; |
1228 | 1228 |
1229 gfx::NativeCursor cursor = current_cursor_.GetNativeCursor(); | 1229 gfx::NativeCursor cursor = current_cursor_.GetNativeCursor(); |
1230 if (is_loading_ && cursor == ui::kCursorPointer) | 1230 if (is_loading_) |
1231 cursor = ui::kCursorProgress; | 1231 cursor = ui::kCursorPointer; |
1232 | 1232 |
1233 root_window->SetCursor(cursor); | 1233 root_window->SetCursor(cursor); |
1234 } | 1234 } |
1235 | 1235 |
1236 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { | 1236 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { |
1237 aura::RootWindow* root_window = window_->GetRootWindow(); | 1237 aura::RootWindow* root_window = window_->GetRootWindow(); |
1238 return root_window->GetProperty(aura::client::kRootWindowInputMethodKey); | 1238 return root_window->GetProperty(aura::client::kRootWindowInputMethodKey); |
1239 } | 1239 } |
1240 | 1240 |
1241 bool RenderWidgetHostViewAura::NeedsInputGrab() { | 1241 bool RenderWidgetHostViewAura::NeedsInputGrab() { |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1342 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1342 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
1343 RenderWidgetHost* widget) { | 1343 RenderWidgetHost* widget) { |
1344 return new RenderWidgetHostViewAura(widget); | 1344 return new RenderWidgetHostViewAura(widget); |
1345 } | 1345 } |
1346 | 1346 |
1347 // static | 1347 // static |
1348 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1348 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
1349 WebKit::WebScreenInfo* results) { | 1349 WebKit::WebScreenInfo* results) { |
1350 GetScreenInfoForWindow(results, NULL); | 1350 GetScreenInfoForWindow(results, NULL); |
1351 } | 1351 } |
OLD | NEW |