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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 326403002: Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed. Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/frame_host/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include "content/browser/frame_host/cross_process_frame_connector.h" 7 #include "content/browser/frame_host/cross_process_frame_connector.h"
8 #include "content/browser/renderer_host/render_widget_host_impl.h" 8 #include "content/browser/renderer_host/render_widget_host_impl.h"
9 #include "content/common/gpu/gpu_messages.h" 9 #include "content/common/gpu/gpu_messages.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 void RenderWidgetHostViewChildFrame::Blur() { 138 void RenderWidgetHostViewChildFrame::Blur() {
139 } 139 }
140 140
141 void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) { 141 void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) {
142 } 142 }
143 143
144 void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) { 144 void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) {
145 NOTREACHED(); 145 NOTREACHED();
146 } 146 }
147 147
148 void RenderWidgetHostViewChildFrame::TextInputTypeChanged( 148 void RenderWidgetHostViewChildFrame::TextInputStateChanged(
149 ui::TextInputType type, 149 const ViewHostMsg_TextInputState_Params& params) {
150 ui::TextInputMode input_mode,
151 bool can_compose_inline) {
152 NOTREACHED(); 150 NOTREACHED();
153 } 151 }
154 152
155 void RenderWidgetHostViewChildFrame::RenderProcessGone( 153 void RenderWidgetHostViewChildFrame::RenderProcessGone(
156 base::TerminationStatus status, 154 base::TerminationStatus status,
157 int error_code) { 155 int error_code) {
158 if (frame_connector_) 156 if (frame_connector_)
159 frame_connector_->RenderProcessGone(); 157 frame_connector_->RenderProcessGone();
160 Destroy(); 158 Destroy();
161 } 159 }
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 const { 331 const {
334 return NULL; 332 return NULL;
335 } 333 }
336 #endif // defined(OS_WIN) 334 #endif // defined(OS_WIN)
337 335
338 SkBitmap::Config RenderWidgetHostViewChildFrame::PreferredReadbackFormat() { 336 SkBitmap::Config RenderWidgetHostViewChildFrame::PreferredReadbackFormat() {
339 return SkBitmap::kARGB_8888_Config; 337 return SkBitmap::kARGB_8888_Config;
340 } 338 }
341 339
342 } // namespace content 340 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698