| Index: extensions/renderer/dispatcher.cc
|
| diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
|
| index a6745048bd10d6862b4d2d68d080e4b546469ecb..7ec76ada39f3944fb04cb4209348c07a7612bb44 100644
|
| --- a/extensions/renderer/dispatcher.cc
|
| +++ b/extensions/renderer/dispatcher.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "extensions/renderer/dispatcher.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include <utility>
|
|
|
| #include "base/bind.h"
|
| @@ -12,6 +14,7 @@
|
| #include "base/command_line.h"
|
| #include "base/debug/alias.h"
|
| #include "base/lazy_instance.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/metrics/user_metrics_action.h"
|
| @@ -21,6 +24,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/time/time.h"
|
| #include "base/values.h"
|
| +#include "build/build_config.h"
|
| #include "content/grit/content_resources.h"
|
| #include "content/public/child/v8_value_converter.h"
|
| #include "content/public/common/browser_plugin_guest_mode.h"
|
| @@ -125,8 +129,8 @@ namespace extensions {
|
|
|
| namespace {
|
|
|
| -static const int64 kInitialExtensionIdleHandlerDelayMs = 5 * 1000;
|
| -static const int64 kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000;
|
| +static const int64_t kInitialExtensionIdleHandlerDelayMs = 5 * 1000;
|
| +static const int64_t kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000;
|
| static const char kEventDispatchFunction[] = "dispatchEvent";
|
| static const char kOnSuspendEvent[] = "runtime.onSuspend";
|
| static const char kOnSuspendCanceledEvent[] = "runtime.onSuspendCanceled";
|
| @@ -935,7 +939,7 @@ void Dispatcher::IdleNotification() {
|
| // Dampen the forced delay as well if the extension stays idle for long
|
| // periods of time. (forced_idle_timer_ can be NULL after
|
| // OnRenderProcessShutdown has been called.)
|
| - int64 forced_delay_ms =
|
| + int64_t forced_delay_ms =
|
| std::max(RenderThread::Get()->GetIdleNotificationDelayInMs(),
|
| kMaxExtensionIdleHandlerDelayMs);
|
| forced_idle_timer_->Stop();
|
| @@ -1097,7 +1101,7 @@ void Dispatcher::OnSetWebViewPartitionID(const std::string& partition_id) {
|
| }
|
|
|
| void Dispatcher::OnShouldSuspend(const std::string& extension_id,
|
| - uint64 sequence_id) {
|
| + uint64_t sequence_id) {
|
| RenderThread::Get()->Send(
|
| new ExtensionHostMsg_ShouldSuspendAck(extension_id, sequence_id));
|
| }
|
|
|