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

Unified Diff: content/browser/plugin_service_impl.cc

Issue 9150016: Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix chromeos ui_tests Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/plugin_service_impl.cc
===================================================================
--- content/browser/plugin_service_impl.cc (revision 117096)
+++ content/browser/plugin_service_impl.cc (working copy)
@@ -135,10 +135,7 @@
}
PluginServiceImpl::PluginServiceImpl()
- : plugin_list_(NULL),
- ui_locale_(
- content::GetContentClient()->browser()->GetApplicationLocale()),
- filter_(NULL) {
+ : plugin_list_(NULL), filter_(NULL) {
}
PluginServiceImpl::~PluginServiceImpl() {
@@ -232,10 +229,6 @@
#endif
}
-const std::string& PluginServiceImpl::GetUILocale() {
- return ui_locale_;
-}
-
PluginProcessHost* PluginServiceImpl::FindNpapiPluginProcess(
const FilePath& plugin_path) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -297,7 +290,7 @@
// This plugin isn't loaded by any plugin process, so create a new process.
scoped_ptr<PluginProcessHost> new_host(new PluginProcessHost());
- if (!new_host->Init(info, ui_locale_)) {
+ if (!new_host->Init(info)) {
NOTREACHED(); // Init is not expected to fail.
return NULL;
}

Powered by Google App Engine
This is Rietveld 408576698