Index: content/renderer/media/renderer_webmediaplayer_delegate.cc |
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc |
index 24dc39d79529c7e630986317a29d188373d725f7..1d3b8a88171391c54f2bbbec28b7a7f2135ef14a 100644 |
--- a/content/renderer/media/renderer_webmediaplayer_delegate.cc |
+++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc |
@@ -7,10 +7,22 @@ |
#include <stdint.h> |
#include "base/auto_reset.h" |
+#include "base/metrics/histogram_macros.h" |
+#include "base/metrics/user_metrics_action.h" |
+#include "base/power_monitor/power_monitor.h" |
#include "content/common/media/media_player_delegate_messages.h" |
#include "content/public/renderer/render_frame.h" |
+#include "content/public/renderer/render_thread.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
+namespace { |
+ |
+void RecordAction(const base::UserMetricsAction& action) { |
+ content::RenderThread::Get()->RecordAction(action); |
mlamouri (slow - plz ping)
2016/08/08 13:19:30
You could also make it take a std::string and do t
whywhat
2016/08/11 21:51:04
Done. I don't think extract_actions.py would extra
|
+} |
+ |
+} // namespace |
+ |
namespace media { |
RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( |
@@ -20,9 +32,25 @@ RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( |
tick_clock_(default_tick_clock_.get()) { |
idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); |
idle_timeout_ = base::TimeDelta::FromSeconds(15); |
+ base::PowerMonitor::Get()->AddObserver(this); |
} |
-RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} |
+RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() { |
+ SetIsPlayingBackgroundVideo(false); |
+ base::PowerMonitor::Get()->RemoveObserver(this); |
+} |
+ |
+void RendererWebMediaPlayerDelegate::OnSuspend() { |
+ if (is_playing_background_video_) |
+ power_suspended_time_ = base::TimeTicks::Now(); |
mlamouri (slow - plz ping)
2016/08/08 13:19:30
I'm a bit confused about this change. If I underst
DaleCurtis
2016/08/08 18:26:45
Yes, suspend behaves differently on other platform
whywhat
2016/08/11 21:51:04
#ifdef'ed with OS_ANDROID, if that's what you mean
|
+} |
+ |
+void RendererWebMediaPlayerDelegate::OnResume() { |
+ if (is_playing_background_video_) { |
mlamouri (slow - plz ping)
2016/08/08 13:19:30
nit: here and above, you could do an early return.
whywhat
2016/08/11 21:51:04
N/A
|
+ background_video_playing_start_time_ += |
+ base::TimeTicks::Now() - power_suspended_time_; |
+ } |
+} |
int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { |
return id_map_.Add(observer); |
@@ -80,12 +108,16 @@ bool RendererWebMediaPlayerDelegate::IsPlayingBackgroundVideo() { |
void RendererWebMediaPlayerDelegate::WasHidden() { |
for (IDMap<Observer>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) |
it.GetCurrentValue()->OnHidden(); |
+ |
+ RecordAction(base::UserMetricsAction("Media.Hidden")); |
} |
void RendererWebMediaPlayerDelegate::WasShown() { |
- is_playing_background_video_ = false; |
+ SetIsPlayingBackgroundVideo(false); |
for (IDMap<Observer>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) |
it.GetCurrentValue()->OnShown(); |
+ |
+ RecordAction(base::UserMetricsAction("Media.Shown")); |
} |
bool RendererWebMediaPlayerDelegate::OnMessageReceived( |
@@ -115,18 +147,22 @@ void RendererWebMediaPlayerDelegate::OnMediaDelegatePause(int delegate_id) { |
Observer* observer = id_map_.Lookup(delegate_id); |
if (observer) { |
if (playing_videos_.find(delegate_id) != playing_videos_.end()) |
- is_playing_background_video_ = false; |
+ SetIsPlayingBackgroundVideo(false); |
observer->OnPause(); |
} |
+ |
+ RecordAction(base::UserMetricsAction("Media.RemoteControls.Pause")); |
} |
void RendererWebMediaPlayerDelegate::OnMediaDelegatePlay(int delegate_id) { |
Observer* observer = id_map_.Lookup(delegate_id); |
if (observer) { |
if (playing_videos_.find(delegate_id) != playing_videos_.end()) |
- is_playing_background_video_ = IsHidden(); |
+ SetIsPlayingBackgroundVideo(IsHidden()); |
observer->OnPlay(); |
} |
+ |
+ RecordAction(base::UserMetricsAction("Media.RemoteControls.Play")); |
} |
void RendererWebMediaPlayerDelegate::OnMediaDelegateSuspendAllMediaPlayers() { |
@@ -193,6 +229,22 @@ void RendererWebMediaPlayerDelegate::CleanupIdleDelegates() { |
idle_cleanup_timer_.Stop(); |
} |
+void RendererWebMediaPlayerDelegate::SetIsPlayingBackgroundVideo( |
+ bool is_playing) { |
+ if (is_playing_background_video_ == is_playing) return; |
+ |
+ if (is_playing_background_video_) { |
+ UMA_HISTOGRAM_LONG_TIMES( |
+ "Media.Session.BackgroundTime", |
+ base::TimeTicks::Now() - background_video_playing_start_time_); |
+ RecordAction(base::UserMetricsAction("Media.Session.BackgroundSuspend")); |
+ } else { |
+ background_video_playing_start_time_ = base::TimeTicks::Now(); |
+ RecordAction(base::UserMetricsAction("Media.Session.BackgroundResume")); |
+ } |
+ is_playing_background_video_ = is_playing; |
+} |
+ |
void RendererWebMediaPlayerDelegate::OnDestruct() { |
delete this; |
} |