| 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 <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1684 gfx::Rect intersected_rect( | 1684 gfx::Rect intersected_rect( |
| 1685 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); | 1685 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); |
| 1686 | 1686 |
| 1687 if (intersected_rect.IsEmpty()) | 1687 if (intersected_rect.IsEmpty()) |
| 1688 return; | 1688 return; |
| 1689 | 1689 |
| 1690 host_->ScrollFocusedEditableNodeIntoRect( | 1690 host_->ScrollFocusedEditableNodeIntoRect( |
| 1691 ConvertRectFromScreen(intersected_rect)); | 1691 ConvertRectFromScreen(intersected_rect)); |
| 1692 } | 1692 } |
| 1693 | 1693 |
| 1694 bool RenderWidgetHostViewAura::IsEditCommandEnabled(int command_id) const { | 1694 bool RenderWidgetHostViewAura::IsTextEditCommandEnabled( |
| 1695 ui::TextEditCommand command) const { |
| 1695 return false; | 1696 return false; |
| 1696 } | 1697 } |
| 1697 | 1698 |
| 1698 void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent(int command_id) { | 1699 void RenderWidgetHostViewAura::SetTextEditCommandForNextKeyEvent( |
| 1699 } | 1700 ui::TextEditCommand command) {} |
| 1700 | 1701 |
| 1701 //////////////////////////////////////////////////////////////////////////////// | 1702 //////////////////////////////////////////////////////////////////////////////// |
| 1702 // RenderWidgetHostViewAura, display::DisplayObserver implementation: | 1703 // RenderWidgetHostViewAura, display::DisplayObserver implementation: |
| 1703 | 1704 |
| 1704 void RenderWidgetHostViewAura::OnDisplayAdded( | 1705 void RenderWidgetHostViewAura::OnDisplayAdded( |
| 1705 const display::Display& new_display) {} | 1706 const display::Display& new_display) {} |
| 1706 | 1707 |
| 1707 void RenderWidgetHostViewAura::OnDisplayRemoved( | 1708 void RenderWidgetHostViewAura::OnDisplayRemoved( |
| 1708 const display::Display& old_display) {} | 1709 const display::Display& old_display) {} |
| 1709 | 1710 |
| (...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3003 | 3004 |
| 3004 //////////////////////////////////////////////////////////////////////////////// | 3005 //////////////////////////////////////////////////////////////////////////////// |
| 3005 // RenderWidgetHostViewBase, public: | 3006 // RenderWidgetHostViewBase, public: |
| 3006 | 3007 |
| 3007 // static | 3008 // static |
| 3008 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3009 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3009 GetScreenInfoForWindow(results, NULL); | 3010 GetScreenInfoForWindow(results, NULL); |
| 3010 } | 3011 } |
| 3011 | 3012 |
| 3012 } // namespace content | 3013 } // namespace content |
| OLD | NEW |