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

Unified Diff: content/ppapi_plugin/ppapi_thread.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/ppapi_plugin/ppapi_thread.h ('k') | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/ppapi_plugin/ppapi_thread.cc
===================================================================
--- content/ppapi_plugin/ppapi_thread.cc (revision 163080)
+++ content/ppapi_plugin/ppapi_thread.cc (working copy)
@@ -45,6 +45,8 @@
extern void* g_target_services;
#endif
+namespace content {
+
typedef int32_t (*InitializeBrokerFunc)
(PP_ConnectInstance_Func* connect_instance_func);
@@ -155,8 +157,8 @@
}
#endif
- return content::BrokerGetFileHandleForProcess(handle, channel.peer_pid(),
- should_close_source);
+ return BrokerGetFileHandleForProcess(handle, channel.peer_pid(),
+ should_close_source);
}
std::set<PP_Instance>* PpapiThread::GetGloballySeenInstanceIDSet() {
@@ -187,7 +189,7 @@
}
void PpapiThread::SetActiveURL(const std::string& url) {
- content::GetContentClient()->SetActiveURL(GURL(url));
+ GetContentClient()->SetActiveURL(GURL(url));
}
uint32 PpapiThread::Register(ppapi::proxy::PluginDispatcher* plugin_dispatcher) {
@@ -276,7 +278,7 @@
// We need to do this after getting |PPP_GetInterface()| (or presumably
// doing something nontrivial with the library), else the sandbox
// intercedes.
- if (!content::InitializeSandbox()) {
+ if (!InitializeSandbox()) {
LOG(WARNING) << "Failed to initialize sandbox";
}
#endif
@@ -399,8 +401,10 @@
// plugin() is NULL when in-process. Which is fine, because this is
// just a hook for setting the process name.
- if (content::GetContentClient()->plugin()) {
- content::GetContentClient()->plugin()->PluginProcessStarted(
+ if (GetContentClient()->plugin()) {
+ GetContentClient()->plugin()->PluginProcessStarted(
path.BaseName().RemoveExtension().LossyDisplayName());
}
}
+
+} // namespace content
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.h ('k') | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698