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

Unified Diff: content/plugin/webplugin_delegate_stub.cc

Issue 11231016: Move content's a plugin, ppapi_plugin, utility, and worker subdirectories to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/plugin/webplugin_delegate_stub.h ('k') | content/plugin/webplugin_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/webplugin_delegate_stub.cc
===================================================================
--- content/plugin/webplugin_delegate_stub.cc (revision 163080)
+++ content/plugin/webplugin_delegate_stub.cc (working copy)
@@ -29,6 +29,8 @@
using webkit::npapi::WebPlugin;
using webkit::npapi::WebPluginResourceClient;
+namespace content {
+
static void DestroyWebPluginAndDelegate(
base::WeakPtr<NPObjectStub> scriptable_object,
webkit::npapi::WebPluginDelegateImpl* delegate,
@@ -57,7 +59,7 @@
WebPluginDelegateStub::~WebPluginDelegateStub() {
in_destructor_ = true;
- content::GetContentClient()->SetActiveURL(page_url_);
+ GetContentClient()->SetActiveURL(page_url_);
if (channel_->in_send()) {
// The delegate or an npobject is in the callstack, so don't delete it
@@ -73,7 +75,7 @@
}
bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
- content::GetContentClient()->SetActiveURL(page_url_);
+ GetContentClient()->SetActiveURL(page_url_);
// A plugin can execute a script to delete itself in any of its NPP methods.
// Hold an extra reference to ourself so that if this does occur and we're
@@ -149,7 +151,7 @@
void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
bool* result) {
page_url_ = params.page_url;
- content::GetContentClient()->SetActiveURL(page_url_);
+ GetContentClient()->SetActiveURL(page_url_);
*result = false;
if (params.arg_names.size() != params.arg_values.size()) {
@@ -419,3 +421,5 @@
delegate_->set_windowed_handle(window);
}
#endif
+
+} // namespace content
« no previous file with comments | « content/plugin/webplugin_delegate_stub.h ('k') | content/plugin/webplugin_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698