diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 06:28:22 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 06:28:22 +0000 |
| commit | 94fcefe3bd9be7ff14dbc46922bcb7b261565136 (patch) | |
| tree | 0d5b9e69b425ae7d5bcf38919b62828a7cbea23a /ppapi/proxy/plugin_globals.h | |
| parent | e2f23bf8d7b6f1ab19ec2d8f351ec48cc80aef0f (diff) | |
| download | chromium_src-94fcefe3bd9be7ff14dbc46922bcb7b261565136.zip chromium_src-94fcefe3bd9be7ff14dbc46922bcb7b261565136.tar.gz chromium_src-94fcefe3bd9be7ff14dbc46922bcb7b261565136.tar.bz2 | |
Revert of Replace --ppapi-keep-alive-throttle command line switch with IPC parameter. (https://codereview.chromium.org/191633002/)
Reason for revert:
This introduced a static initializer in nacl_process_host
Original issue's description:
> Replace --ppapi-keep-alive-throttle command line switch with IPC parameter.
>
> Part of a broad effort to reduce the number of command line switches.
>
> BUG=350510
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256436
TBR=dmichael@chromium.org,mseaborn@chromium.org,inferno@chromium.org,tsepez@chromium.org,scheib@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=350510
Review URL: https://codereview.chromium.org/196763002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_globals.h')
| -rw-r--r-- | ppapi/proxy/plugin_globals.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h index 5dc614d..dac33b6 100644 --- a/ppapi/proxy/plugin_globals.h +++ b/ppapi/proxy/plugin_globals.h @@ -137,7 +137,8 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { // Interval to limit how many IPC messages are sent indicating that the plugin // is active and should be kept alive. The value must be smaller than any // threshold used to kill inactive plugins by the embedder host. - void set_keepalive_throttle_interval_milliseconds(unsigned i); + int keepalive_throttle_interval_milliseconds() const; + void set_keepalive_throttle_interval_milliseconds(int i); private: class BrowserSender; @@ -182,7 +183,7 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { // all considered active. bool plugin_recently_active_; - unsigned keepalive_throttle_interval_milliseconds_; + int keepalive_throttle_interval_milliseconds_; // Member variables should appear before the WeakPtrFactory, see weak_ptr.h. base::WeakPtrFactory<PluginGlobals> weak_factory_; |