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/logging.h" | 10 #include "base/logging.h" |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 | 350 |
351 void RenderWidgetHostViewAura::Hide() { | 351 void RenderWidgetHostViewAura::Hide() { |
352 window_->Hide(); | 352 window_->Hide(); |
353 } | 353 } |
354 | 354 |
355 bool RenderWidgetHostViewAura::IsShowing() { | 355 bool RenderWidgetHostViewAura::IsShowing() { |
356 return window_->IsVisible(); | 356 return window_->IsVisible(); |
357 } | 357 } |
358 | 358 |
359 gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const { | 359 gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const { |
360 return window_->GetScreenBounds(); | 360 return window_->GetBoundsInRootWindow(); |
361 } | 361 } |
362 | 362 |
363 void RenderWidgetHostViewAura::UpdateCursor(const WebCursor& cursor) { | 363 void RenderWidgetHostViewAura::UpdateCursor(const WebCursor& cursor) { |
364 current_cursor_ = cursor; | 364 current_cursor_ = cursor; |
365 UpdateCursorIfOverSelf(); | 365 UpdateCursorIfOverSelf(); |
366 } | 366 } |
367 | 367 |
368 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { | 368 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { |
369 is_loading_ = is_loading; | 369 is_loading_ = is_loading; |
370 UpdateCursorIfOverSelf(); | 370 UpdateCursorIfOverSelf(); |
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1322 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1322 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
1323 RenderWidgetHost* widget) { | 1323 RenderWidgetHost* widget) { |
1324 return new RenderWidgetHostViewAura(widget); | 1324 return new RenderWidgetHostViewAura(widget); |
1325 } | 1325 } |
1326 | 1326 |
1327 // static | 1327 // static |
1328 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1328 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
1329 WebKit::WebScreenInfo* results) { | 1329 WebKit::WebScreenInfo* results) { |
1330 GetScreenInfoForWindow(results, NULL); | 1330 GetScreenInfoForWindow(results, NULL); |
1331 } | 1331 } |
OLD | NEW |