| Index: content/browser/renderer_host/render_view_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
| index 2b7b65c3231229530932dcf294a8d719a22724f8..4ef76db9f0702802353b1b4ec9cf0a2bb14a357b 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_view_host_impl.cc
|
| @@ -27,7 +27,6 @@
|
| #include "content/browser/dom_storage/session_storage_namespace_impl.h"
|
| #include "content/browser/gpu/gpu_surface_tracker.h"
|
| #include "content/browser/host_zoom_map_impl.h"
|
| -#include "content/browser/power_save_blocker.h"
|
| #include "content/browser/renderer_host/dip_util.h"
|
| #include "content/browser/renderer_host/render_process_host_impl.h"
|
| #include "content/browser/renderer_host/render_view_host_delegate.h"
|
| @@ -51,6 +50,7 @@
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| +#include "content/public/browser/power_save_blocker.h"
|
| #include "content/public/browser/render_view_host_observer.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/common/bindings_policy.h"
|
| @@ -1969,19 +1969,19 @@ void RenderViewHostImpl::OnMediaNotification(int64 player_cookie,
|
| bool has_audio,
|
| bool is_playing) {
|
| if (is_playing) {
|
| - PowerSaveBlocker* blocker = NULL;
|
| + scoped_ptr<PowerSaveBlocker> blocker;
|
| if (has_video) {
|
| - blocker = new PowerSaveBlocker(
|
| + blocker = PowerSaveBlocker::Create(
|
| PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
|
| "Playing video");
|
| } else if (has_audio) {
|
| - blocker = new PowerSaveBlocker(
|
| + blocker = PowerSaveBlocker::Create(
|
| PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
|
| "Playing audio");
|
| }
|
|
|
| if (blocker)
|
| - power_save_blockers_[player_cookie] = blocker;
|
| + power_save_blockers_[player_cookie] = blocker.release();
|
| } else {
|
| delete power_save_blockers_[player_cookie];
|
| power_save_blockers_.erase(player_cookie);
|
|
|