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_base.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/accessibility/browser_accessibility_manager.h" | 9 #include "content/browser/accessibility/browser_accessibility_manager.h" |
10 #include "content/browser/gpu/gpu_data_manager_impl.h" | 10 #include "content/browser/gpu/gpu_data_manager_impl.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 NOTREACHED() << "Selection bounds should be routed through the compositor."; | 112 NOTREACHED() << "Selection bounds should be routed through the compositor."; |
113 #endif | 113 #endif |
114 } | 114 } |
115 | 115 |
116 float RenderWidgetHostViewBase::GetBottomControlsHeight() const { | 116 float RenderWidgetHostViewBase::GetBottomControlsHeight() const { |
117 return 0.f; | 117 return 0.f; |
118 } | 118 } |
119 | 119 |
120 void RenderWidgetHostViewBase::SelectionChanged(const base::string16& text, | 120 void RenderWidgetHostViewBase::SelectionChanged(const base::string16& text, |
121 size_t offset, | 121 size_t offset, |
122 const gfx::Range& range) { | 122 const gfx::Range& range, |
123 if (GetTextInputManager()) | 123 bool user_initiated) { |
124 GetTextInputManager()->SelectionChanged(this, text, offset, range); | 124 if (GetTextInputManager()) { |
| 125 GetTextInputManager()->SelectionChanged(this, text, offset, range, |
| 126 user_initiated); |
| 127 } |
125 } | 128 } |
126 | 129 |
127 gfx::Size RenderWidgetHostViewBase::GetRequestedRendererSize() const { | 130 gfx::Size RenderWidgetHostViewBase::GetRequestedRendererSize() const { |
128 return GetViewBounds().size(); | 131 return GetViewBounds().size(); |
129 } | 132 } |
130 | 133 |
131 ui::TextInputClient* RenderWidgetHostViewBase::GetTextInputClient() { | 134 ui::TextInputClient* RenderWidgetHostViewBase::GetTextInputClient() { |
132 NOTREACHED(); | 135 NOTREACHED(); |
133 return NULL; | 136 return NULL; |
134 } | 137 } |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 | 506 |
504 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const { | 507 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const { |
505 return false; | 508 return false; |
506 } | 509 } |
507 | 510 |
508 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const { | 511 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const { |
509 return cc::SurfaceId(); | 512 return cc::SurfaceId(); |
510 } | 513 } |
511 | 514 |
512 } // namespace content | 515 } // namespace content |
OLD | NEW |