| 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 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1678 gfx::Rect intersected_rect( | 1678 gfx::Rect intersected_rect( |
| 1679 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); | 1679 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); |
| 1680 | 1680 |
| 1681 if (intersected_rect.IsEmpty()) | 1681 if (intersected_rect.IsEmpty()) |
| 1682 return; | 1682 return; |
| 1683 | 1683 |
| 1684 host_->ScrollFocusedEditableNodeIntoRect( | 1684 host_->ScrollFocusedEditableNodeIntoRect( |
| 1685 ConvertRectFromScreen(intersected_rect)); | 1685 ConvertRectFromScreen(intersected_rect)); |
| 1686 } | 1686 } |
| 1687 | 1687 |
| 1688 bool RenderWidgetHostViewAura::IsEditCommandEnabled(int command_id) { | 1688 bool RenderWidgetHostViewAura::IsEditCommandEnabled(int command_id) const { |
| 1689 return false; | 1689 return false; |
| 1690 } | 1690 } |
| 1691 | 1691 |
| 1692 void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent(int command_id) { | 1692 void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent(int command_id) { |
| 1693 } | 1693 } |
| 1694 | 1694 |
| 1695 //////////////////////////////////////////////////////////////////////////////// | 1695 //////////////////////////////////////////////////////////////////////////////// |
| 1696 // RenderWidgetHostViewAura, display::DisplayObserver implementation: | 1696 // RenderWidgetHostViewAura, display::DisplayObserver implementation: |
| 1697 | 1697 |
| 1698 void RenderWidgetHostViewAura::OnDisplayAdded( | 1698 void RenderWidgetHostViewAura::OnDisplayAdded( |
| (...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2990 | 2990 |
| 2991 //////////////////////////////////////////////////////////////////////////////// | 2991 //////////////////////////////////////////////////////////////////////////////// |
| 2992 // RenderWidgetHostViewBase, public: | 2992 // RenderWidgetHostViewBase, public: |
| 2993 | 2993 |
| 2994 // static | 2994 // static |
| 2995 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2995 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2996 GetScreenInfoForWindow(results, NULL); | 2996 GetScreenInfoForWindow(results, NULL); |
| 2997 } | 2997 } |
| 2998 | 2998 |
| 2999 } // namespace content | 2999 } // namespace content |
| OLD | NEW |