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

Unified Diff: content/plugin/plugin_thread.cc

Issue 9215005: Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « content/plugin/plugin_channel.cc ('k') | content/ppapi_plugin/broker_process_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_thread.cc
===================================================================
--- content/plugin/plugin_thread.cc (revision 117824)
+++ content/plugin/plugin_thread.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -49,15 +49,14 @@
private:
virtual void OnChannelError() {
// How long we wait before forcibly shutting down the process.
- const base::TimeDelta kPluginProcessTerminateTimeout =
- base::TimeDelta::FromSeconds(3);
+ const int kPluginProcessTerminateTimeoutMs = 3000;
// Ensure that we don't wait indefinitely for the plugin to shutdown.
// as the browser does not terminate plugin processes on shutdown.
// We achieve this by posting an exit process task on the IO thread.
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&EnsureTerminateMessageFilter::Terminate, this),
- kPluginProcessTerminateTimeout);
+ kPluginProcessTerminateTimeoutMs);
}
void Terminate() {
« no previous file with comments | « content/plugin/plugin_channel.cc ('k') | content/ppapi_plugin/broker_process_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698