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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 | 451 |
452 void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) { | 452 void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) { |
453 tooltip_ = tooltip_text; | 453 tooltip_ = tooltip_text; |
454 aura::RootWindow* root_window = window_->GetRootWindow(); | 454 aura::RootWindow* root_window = window_->GetRootWindow(); |
455 if (aura::client::GetTooltipClient(root_window)) | 455 if (aura::client::GetTooltipClient(root_window)) |
456 aura::client::GetTooltipClient(root_window)->UpdateTooltip(window_); | 456 aura::client::GetTooltipClient(root_window)->UpdateTooltip(window_); |
457 } | 457 } |
458 | 458 |
459 void RenderWidgetHostViewAura::SelectionBoundsChanged( | 459 void RenderWidgetHostViewAura::SelectionBoundsChanged( |
460 const gfx::Rect& start_rect, | 460 const gfx::Rect& start_rect, |
461 const gfx::Rect& end_rect) { | 461 WebKit::WebTextDirection start_direction, |
| 462 const gfx::Rect& end_rect, |
| 463 WebKit::WebTextDirection end_direction) { |
462 if (selection_start_rect_ == start_rect && selection_end_rect_ == end_rect) | 464 if (selection_start_rect_ == start_rect && selection_end_rect_ == end_rect) |
463 return; | 465 return; |
464 | 466 |
465 selection_start_rect_ = start_rect; | 467 selection_start_rect_ = start_rect; |
466 selection_end_rect_ = end_rect; | 468 selection_end_rect_ = end_rect; |
467 | 469 |
468 GetInputMethod()->OnCaretBoundsChanged(this); | 470 GetInputMethod()->OnCaretBoundsChanged(this); |
469 } | 471 } |
470 | 472 |
471 BackingStore* RenderWidgetHostViewAura::AllocBackingStore( | 473 BackingStore* RenderWidgetHostViewAura::AllocBackingStore( |
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1655 RenderWidgetHost* widget) { | 1657 RenderWidgetHost* widget) { |
1656 return new RenderWidgetHostViewAura(widget); | 1658 return new RenderWidgetHostViewAura(widget); |
1657 } | 1659 } |
1658 | 1660 |
1659 // static | 1661 // static |
1660 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 1662 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
1661 GetScreenInfoForWindow(results, NULL); | 1663 GetScreenInfoForWindow(results, NULL); |
1662 } | 1664 } |
1663 | 1665 |
1664 } // namespace content | 1666 } // namespace content |
OLD | NEW |