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

Unified Diff: ppapi/proxy/plugin_main_nacl.cc

Issue 128433005: Revert of Test Keeping NaCl plugins used in app background pages alive when active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « extensions/browser/process_manager.cc ('k') | ppapi/shared_impl/ppapi_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/plugin_main_nacl.cc
diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc
index 6690f2059cba8ee6f3e1dd6e73adf8ced9617b08..bced1083f0d53bcc310c187c24f5ed6d00702640 100644
--- a/ppapi/proxy/plugin_main_nacl.cc
+++ b/ppapi/proxy/plugin_main_nacl.cc
@@ -13,7 +13,6 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
-#include "base/strings/string_number_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "components/tracing/child_trace_message_filter.h"
@@ -30,7 +29,6 @@
#include "ppapi/proxy/plugin_message_filter.h"
#include "ppapi/proxy/plugin_proxy_delegate.h"
#include "ppapi/proxy/resource_reply_thread_registrar.h"
-#include "ppapi/shared_impl/ppapi_switches.h"
#include "ppapi/shared_impl/ppb_audio_shared.h"
#if defined(IPC_MESSAGE_LOG_ENABLED)
@@ -96,8 +94,6 @@
const ppapi::PpapiNaClChannelArgs& args,
SerializedHandle handle);
void OnPluginDispatcherMessageReceived(const IPC::Message& msg);
-
- void SetPpapiKeepAliveThrottleFromCommandLine();
std::set<PP_Instance> instances_;
std::map<uint32, PluginDispatcher*> plugin_dispatchers_;
@@ -212,7 +208,6 @@
logging::LoggingSettings settings;
settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
logging::InitLogging(settings);
- SetPpapiKeepAliveThrottleFromCommandLine();
command_line_and_logging_initialized = true;
}
// Tell the process-global GetInterface which interfaces it can return to the
@@ -253,18 +248,6 @@
plugin_dispatchers_.find(id);
if (dispatcher != plugin_dispatchers_.end())
dispatcher->second->OnMessageReceived(msg);
-}
-
-void PpapiDispatcher::SetPpapiKeepAliveThrottleFromCommandLine() {
- unsigned keepalive_throttle_interval_milliseconds = 0;
- if (base::StringToUint(
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kPpapiKeepAliveThrottle),
- &keepalive_throttle_interval_milliseconds)) {
- ppapi::proxy::PluginGlobals::Get()->
- set_keepalive_throttle_interval_milliseconds(
- keepalive_throttle_interval_milliseconds);
- }
}
} // namespace
« no previous file with comments | « extensions/browser/process_manager.cc ('k') | ppapi/shared_impl/ppapi_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698