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

Side by Side Diff: chrome/renderer/render_view.cc

Issue 2934018: Take out temporary code now that WebKit plugin change is rolled. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | webkit/glue/plugins/pepper_webplugin_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 3493 matching lines...) Expand 10 before | Expand all | Expand 10 after
3504 3504
3505 void RenderView::OnFind(int request_id, const string16& search_text, 3505 void RenderView::OnFind(int request_id, const string16& search_text,
3506 const WebFindOptions& options) { 3506 const WebFindOptions& options) {
3507 WebFrame* main_frame = webview()->mainFrame(); 3507 WebFrame* main_frame = webview()->mainFrame();
3508 3508
3509 if (main_frame->document().isPluginDocument()) { 3509 if (main_frame->document().isPluginDocument()) {
3510 if (options.findNext) { 3510 if (options.findNext) {
3511 // Just navigate back/forward. 3511 // Just navigate back/forward.
3512 GetWebPluginFromPluginDocument()->selectFindResult(options.forward); 3512 GetWebPluginFromPluginDocument()->selectFindResult(options.forward);
3513 } else { 3513 } else {
3514 #if defined(WEBPLUGIN_FIND_HAS_RETURN_TYPE)
3515 if (GetWebPluginFromPluginDocument()->startFind( 3514 if (GetWebPluginFromPluginDocument()->startFind(
3516 search_text, options.matchCase, request_id)) { 3515 search_text, options.matchCase, request_id)) {
3517 #else
3518 if (GetWebPluginFromPluginDocument()->supportsFind()) {
3519 GetWebPluginFromPluginDocument()->startFind(
3520 search_text, options.matchCase, request_id);
3521 #endif
3522 } else { 3516 } else {
3523 ReportNoFindInPageResults(request_id); 3517 ReportNoFindInPageResults(request_id);
3524 } 3518 }
3525 } 3519 }
3526 return; 3520 return;
3527 } 3521 }
3528 3522
3529 WebFrame* frame_after_main = main_frame->traverseNext(true); 3523 WebFrame* frame_after_main = main_frame->traverseNext(true);
3530 WebFrame* focused_frame = webview()->focusedFrame(); 3524 WebFrame* focused_frame = webview()->focusedFrame();
3531 WebFrame* search_frame = focused_frame; // start searching focused frame. 3525 WebFrame* search_frame = focused_frame; // start searching focused frame.
(...skipping 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after
5269 webkit_glue::FormData form; 5263 webkit_glue::FormData form;
5270 const WebInputElement element = node.toConst<WebInputElement>(); 5264 const WebInputElement element = node.toConst<WebInputElement>();
5271 if (!form_manager_.FindFormWithFormControlElement( 5265 if (!form_manager_.FindFormWithFormControlElement(
5272 element, FormManager::REQUIRE_NONE, &form)) 5266 element, FormManager::REQUIRE_NONE, &form))
5273 return; 5267 return;
5274 5268
5275 autofill_action_ = action; 5269 autofill_action_ = action;
5276 Send(new ViewHostMsg_FillAutoFillFormData( 5270 Send(new ViewHostMsg_FillAutoFillFormData(
5277 routing_id_, autofill_query_id_, form, value, label)); 5271 routing_id_, autofill_query_id_, form, value, label));
5278 } 5272 }
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/plugins/pepper_webplugin_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698