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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 11968054: <webview>: Implement ExecuteScript (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed misnamed variable Created 7 years, 11 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
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/renderer/browser_plugin/browser_plugin.h" 5 #include "content/renderer/browser_plugin/browser_plugin.h"
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 resize_ack_received_(true), 117 resize_ack_received_(true),
118 sad_guest_(NULL), 118 sad_guest_(NULL),
119 guest_crashed_(false), 119 guest_crashed_(false),
120 navigate_src_sent_(false), 120 navigate_src_sent_(false),
121 auto_size_(false), 121 auto_size_(false),
122 max_height_(0), 122 max_height_(0),
123 max_width_(0), 123 max_width_(0),
124 min_height_(0), 124 min_height_(0),
125 min_width_(0), 125 min_width_(0),
126 process_id_(-1), 126 process_id_(-1),
127 guest_route_id_(-1),
127 persist_storage_(false), 128 persist_storage_(false),
128 valid_partition_id_(true), 129 valid_partition_id_(true),
129 content_window_routing_id_(MSG_ROUTING_NONE), 130 content_window_routing_id_(MSG_ROUTING_NONE),
130 plugin_focused_(false), 131 plugin_focused_(false),
131 visible_(true), 132 visible_(true),
132 size_changed_in_flight_(false), 133 size_changed_in_flight_(false),
133 browser_plugin_manager_(render_view->browser_plugin_manager()), 134 browser_plugin_manager_(render_view->browser_plugin_manager()),
134 current_nav_entry_index_(0), 135 current_nav_entry_index_(0),
135 nav_entry_count_(0), 136 nav_entry_count_(0),
136 compositing_enabled_(false) { 137 compositing_enabled_(false) {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 int instance_id, 392 int instance_id,
392 const BrowserPluginMsg_LoadCommit_Params& params) { 393 const BrowserPluginMsg_LoadCommit_Params& params) {
393 // If the guest has just committed a new navigation then it is no longer 394 // If the guest has just committed a new navigation then it is no longer
394 // crashed. 395 // crashed.
395 guest_crashed_ = false; 396 guest_crashed_ = false;
396 if (params.is_top_level) { 397 if (params.is_top_level) {
397 src_ = params.url.spec(); 398 src_ = params.url.spec();
398 UpdateDOMAttribute(kSrc, src_.c_str()); 399 UpdateDOMAttribute(kSrc, src_.c_str());
399 } 400 }
400 process_id_ = params.process_id; 401 process_id_ = params.process_id;
402 guest_route_id_ = params.route_id;
401 current_nav_entry_index_ = params.current_entry_index; 403 current_nav_entry_index_ = params.current_entry_index;
402 nav_entry_count_ = params.entry_count; 404 nav_entry_count_ = params.entry_count;
403 405
404 std::map<std::string, base::Value*> props; 406 std::map<std::string, base::Value*> props;
405 props[kURL] = base::Value::CreateStringValue(params.url.spec()); 407 props[kURL] = base::Value::CreateStringValue(params.url.spec());
406 props[kIsTopLevel] = base::Value::CreateBooleanValue(params.is_top_level); 408 props[kIsTopLevel] = base::Value::CreateBooleanValue(params.is_top_level);
407 TriggerEvent(kEventLoadCommit, &props); 409 TriggerEvent(kEventLoadCommit, &props);
408 } 410 }
409 411
410 void BrowserPlugin::OnLoadRedirect(int instance_id, 412 void BrowserPlugin::OnLoadRedirect(int instance_id,
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 void* notify_data) { 1094 void* notify_data) {
1093 } 1095 }
1094 1096
1095 void BrowserPlugin::didFailLoadingFrameRequest( 1097 void BrowserPlugin::didFailLoadingFrameRequest(
1096 const WebKit::WebURL& url, 1098 const WebKit::WebURL& url,
1097 void* notify_data, 1099 void* notify_data,
1098 const WebKit::WebURLError& error) { 1100 const WebKit::WebURLError& error) {
1099 } 1101 }
1100 1102
1101 } // namespace content 1103 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698