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 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1580 gfx::Rect intersected_rect( | 1580 gfx::Rect intersected_rect( |
1581 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); | 1581 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); |
1582 | 1582 |
1583 if (intersected_rect.IsEmpty()) | 1583 if (intersected_rect.IsEmpty()) |
1584 return; | 1584 return; |
1585 | 1585 |
1586 host_->ScrollFocusedEditableNodeIntoRect( | 1586 host_->ScrollFocusedEditableNodeIntoRect( |
1587 ConvertRectFromScreen(intersected_rect)); | 1587 ConvertRectFromScreen(intersected_rect)); |
1588 } | 1588 } |
1589 | 1589 |
1590 bool RenderWidgetHostViewAura::IsEditCommandEnabled(int command_id) { | 1590 bool RenderWidgetHostViewAura::IsEditCommandEnabled( |
| 1591 ui::TextEditCommand command) const { |
1591 return false; | 1592 return false; |
1592 } | 1593 } |
1593 | 1594 |
1594 void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent(int command_id) { | 1595 void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent( |
1595 } | 1596 ui::TextEditCommand command) {} |
1596 | 1597 |
1597 //////////////////////////////////////////////////////////////////////////////// | 1598 //////////////////////////////////////////////////////////////////////////////// |
1598 // RenderWidgetHostViewAura, display::DisplayObserver implementation: | 1599 // RenderWidgetHostViewAura, display::DisplayObserver implementation: |
1599 | 1600 |
1600 void RenderWidgetHostViewAura::OnDisplayAdded( | 1601 void RenderWidgetHostViewAura::OnDisplayAdded( |
1601 const display::Display& new_display) {} | 1602 const display::Display& new_display) {} |
1602 | 1603 |
1603 void RenderWidgetHostViewAura::OnDisplayRemoved( | 1604 void RenderWidgetHostViewAura::OnDisplayRemoved( |
1604 const display::Display& old_display) {} | 1605 const display::Display& old_display) {} |
1605 | 1606 |
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2869 | 2870 |
2870 //////////////////////////////////////////////////////////////////////////////// | 2871 //////////////////////////////////////////////////////////////////////////////// |
2871 // RenderWidgetHostViewBase, public: | 2872 // RenderWidgetHostViewBase, public: |
2872 | 2873 |
2873 // static | 2874 // static |
2874 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2875 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2875 GetScreenInfoForWindow(results, NULL); | 2876 GetScreenInfoForWindow(results, NULL); |
2876 } | 2877 } |
2877 | 2878 |
2878 } // namespace content | 2879 } // namespace content |
OLD | NEW |