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

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

Issue 3015029: Replace ViewHostMsg_GetPluginPath with ViewHostMsg_GetPluginInfo. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: compile fixes Created 10 years, 4 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
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.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/blocked_plugin.h" 5 #include "chrome/renderer/blocked_plugin.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 void BlockedPlugin::Load(const CppArgumentList& args, CppVariant* result) { 71 void BlockedPlugin::Load(const CppArgumentList& args, CppVariant* result) {
72 LoadPlugin(); 72 LoadPlugin();
73 } 73 }
74 74
75 void BlockedPlugin::LoadPlugin() { 75 void BlockedPlugin::LoadPlugin() {
76 CHECK(plugin_); 76 CHECK(plugin_);
77 WebPluginContainer* container = plugin_->container(); 77 WebPluginContainer* container = plugin_->container();
78 WebPlugin* new_plugin = 78 WebPlugin* new_plugin =
79 render_view_->CreatePluginInternal(frame_, 79 render_view_->CreatePluginInternal(frame_,
80 plugin_params_, 80 plugin_params_,
81 std::string(), 81 NULL,
82 FilePath()); 82 std::string());
83 if (new_plugin && new_plugin->initialize(container)) { 83 if (new_plugin && new_plugin->initialize(container)) {
84 container->setPlugin(new_plugin); 84 container->setPlugin(new_plugin);
85 plugin_->ReplayReceivedData(new_plugin); 85 plugin_->ReplayReceivedData(new_plugin);
86 container->invalidate(); 86 container->invalidate();
87 container->reportGeometry(); 87 container->reportGeometry();
88 plugin_->destroy(); 88 plugin_->destroy();
89 } 89 }
90 } 90 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698