Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2029733003: Views: Replace resource ids with ui::TextEditCommand enum for text editing commands in Textfield. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: === Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "content/browser/renderer_host/legacy_render_widget_host_win.h" 102 #include "content/browser/renderer_host/legacy_render_widget_host_win.h"
103 #include "ui/base/win/hidden_window.h" 103 #include "ui/base/win/hidden_window.h"
104 #include "ui/base/win/osk_display_manager.h" 104 #include "ui/base/win/osk_display_manager.h"
105 #include "ui/base/win/osk_display_observer.h" 105 #include "ui/base/win/osk_display_observer.h"
106 #include "ui/display/win/screen_win.h" 106 #include "ui/display/win/screen_win.h"
107 #include "ui/gfx/gdi_util.h" 107 #include "ui/gfx/gdi_util.h"
108 #endif 108 #endif
109 109
110 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 110 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
111 #include "content/common/input_messages.h" 111 #include "content/common/input_messages.h"
112 #include "ui/events/linux/text_edit_command_auralinux.h" 112 #include "ui/base/ime/linux/text_edit_command_auralinux.h"
113 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" 113 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
114 #endif 114 #endif
115 115
116 using gfx::RectToSkIRect; 116 using gfx::RectToSkIRect;
117 using gfx::SkIRectToRect; 117 using gfx::SkIRectToRect;
118 118
119 using blink::WebScreenInfo; 119 using blink::WebScreenInfo;
120 using blink::WebInputEvent; 120 using blink::WebInputEvent;
121 using blink::WebGestureEvent; 121 using blink::WebGestureEvent;
122 using blink::WebTouchEvent; 122 using blink::WebTouchEvent;
123 123
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 gfx::Rect intersected_rect( 1680 gfx::Rect intersected_rect(
1681 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); 1681 gfx::IntersectRects(rect, window_->GetBoundsInScreen()));
1682 1682
1683 if (intersected_rect.IsEmpty()) 1683 if (intersected_rect.IsEmpty())
1684 return; 1684 return;
1685 1685
1686 host_->ScrollFocusedEditableNodeIntoRect( 1686 host_->ScrollFocusedEditableNodeIntoRect(
1687 ConvertRectFromScreen(intersected_rect)); 1687 ConvertRectFromScreen(intersected_rect));
1688 } 1688 }
1689 1689
1690 bool RenderWidgetHostViewAura::IsEditCommandEnabled(int command_id) const { 1690 bool RenderWidgetHostViewAura::IsTextEditCommandEnabled(
1691 ui::TextEditCommand command) const {
1691 return false; 1692 return false;
1692 } 1693 }
1693 1694
1694 void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent(int command_id) { 1695 void RenderWidgetHostViewAura::SetTextEditCommandForNextKeyEvent(
1695 } 1696 ui::TextEditCommand command) {}
1696 1697
1697 //////////////////////////////////////////////////////////////////////////////// 1698 ////////////////////////////////////////////////////////////////////////////////
1698 // RenderWidgetHostViewAura, display::DisplayObserver implementation: 1699 // RenderWidgetHostViewAura, display::DisplayObserver implementation:
1699 1700
1700 void RenderWidgetHostViewAura::OnDisplayAdded( 1701 void RenderWidgetHostViewAura::OnDisplayAdded(
1701 const display::Display& new_display) {} 1702 const display::Display& new_display) {}
1702 1703
1703 void RenderWidgetHostViewAura::OnDisplayRemoved( 1704 void RenderWidgetHostViewAura::OnDisplayRemoved(
1704 const display::Display& old_display) {} 1705 const display::Display& old_display) {}
1705 1706
(...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after
3026 3027
3027 //////////////////////////////////////////////////////////////////////////////// 3028 ////////////////////////////////////////////////////////////////////////////////
3028 // RenderWidgetHostViewBase, public: 3029 // RenderWidgetHostViewBase, public:
3029 3030
3030 // static 3031 // static
3031 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 3032 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
3032 GetScreenInfoForWindow(results, NULL); 3033 GetScreenInfoForWindow(results, NULL);
3033 } 3034 }
3034 3035
3035 } // namespace content 3036 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698