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

Unified Diff: content/browser/ppapi_plugin_process_host.cc

Issue 11235068: Move the remaning files in content\common to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
Index: content/browser/ppapi_plugin_process_host.cc
===================================================================
--- content/browser/ppapi_plugin_process_host.cc (revision 163632)
+++ content/browser/ppapi_plugin_process_host.cc (working copy)
@@ -26,8 +26,7 @@
#include "ui/base/ui_base_switches.h"
#include "webkit/plugins/plugin_switches.h"
-using content::ChildProcessHost;
-using content::ChildProcessHostImpl;
+namespace content {
class PpapiPluginProcessHost::PluginNetworkObserver
: public net::NetworkChangeNotifier::IPAddressObserver,
@@ -74,7 +73,7 @@
// static
PpapiPluginProcessHost* PpapiPluginProcessHost::CreatePluginHost(
- const content::PepperPluginInfo& info,
+ const PepperPluginInfo& info,
const FilePath& profile_data_directory,
net::HostResolver* host_resolver) {
PpapiPluginProcessHost* plugin_host = new PpapiPluginProcessHost(
@@ -88,7 +87,7 @@
// static
PpapiPluginProcessHost* PpapiPluginProcessHost::CreateBrokerHost(
- const content::PepperPluginInfo& info) {
+ const PepperPluginInfo& info) {
PpapiPluginProcessHost* plugin_host =
new PpapiPluginProcessHost();
if (plugin_host->Init(info))
@@ -158,7 +157,7 @@
}
PpapiPluginProcessHost::PpapiPluginProcessHost(
- const content::PepperPluginInfo& info,
+ const PepperPluginInfo& info,
const FilePath& profile_data_directory,
net::HostResolver* host_resolver)
: permissions_(
@@ -167,12 +166,12 @@
profile_data_directory_(profile_data_directory),
is_broker_(false) {
process_.reset(new BrowserChildProcessHostImpl(
- content::PROCESS_TYPE_PPAPI_PLUGIN, this));
+ PROCESS_TYPE_PPAPI_PLUGIN, this));
filter_ = new PepperMessageFilter(PepperMessageFilter::PLUGIN,
host_resolver);
- host_impl_ = new content::BrowserPpapiHostImpl(this, permissions_);
+ host_impl_ = new BrowserPpapiHostImpl(this, permissions_);
file_filter_ = new PepperTrustedFileMessageFilter(
process_->GetData().id, info.name, profile_data_directory);
@@ -181,19 +180,19 @@
process_->GetHost()->AddFilter(file_filter_.get());
process_->GetHost()->AddFilter(host_impl_.get());
- content::GetContentClient()->browser()->DidCreatePpapiPlugin(host_impl_);
+ GetContentClient()->browser()->DidCreatePpapiPlugin(host_impl_);
}
PpapiPluginProcessHost::PpapiPluginProcessHost()
: is_broker_(true) {
process_.reset(new BrowserChildProcessHostImpl(
- content::PROCESS_TYPE_PPAPI_BROKER, this));
+ PROCESS_TYPE_PPAPI_BROKER, this));
ppapi::PpapiPermissions permissions; // No permissions.
- host_impl_ = new content::BrowserPpapiHostImpl(this, permissions);
+ host_impl_ = new BrowserPpapiHostImpl(this, permissions);
}
-bool PpapiPluginProcessHost::Init(const content::PepperPluginInfo& info) {
+bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
plugin_path_ = info.path;
if (info.name.empty()) {
process_->SetName(plugin_path_.BaseName().LossyDisplayName());
@@ -248,8 +247,7 @@
arraysize(kPluginForwardSwitches));
}
- std::string locale =
- content::GetContentClient()->browser()->GetApplicationLocale();
+ std::string locale = GetContentClient()->browser()->GetApplicationLocale();
if (!locale.empty()) {
// Pass on the locale so the plugin will know what language we're using.
cmd_line->AppendSwitchASCII(switches::kLang, locale);
@@ -366,3 +364,5 @@
client->OnPpapiChannelOpened(channel_handle, process_->GetData().id);
}
+
+} // namespace content
« no previous file with comments | « content/browser/ppapi_plugin_process_host.h ('k') | content/browser/renderer_host/java/java_bridge_channel_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698