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

Unified Diff: content/browser/media/session/pepper_playback_observer.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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/browser/loader/navigation_url_loader.cc ('k') | content/browser/net/network_errors_listing_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/pepper_playback_observer.cc
diff --git a/content/browser/media/session/pepper_playback_observer.cc b/content/browser/media/session/pepper_playback_observer.cc
index a60ba99d14b444e30dbc05ab80ee345ee8e79f92..0b7c2ead4da223314eabd710cf510093f6a9c266 100644
--- a/content/browser/media/session/pepper_playback_observer.cc
+++ b/content/browser/media/session/pepper_playback_observer.cc
@@ -17,7 +17,7 @@ namespace content {
namespace {
-bool ShouldDuckFlash() {
+bool ShouldDuckFlashFoo() {
return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kEnableAudioFocus) ==
switches::kEnableAudioFocusDuckFlash;
@@ -85,7 +85,7 @@ void PepperPlaybackObserver::PepperStartsPlayback(
MediaSessionImpl::Get(contents_)->AddPlayer(
players_map_[id].get(), PepperPlayerDelegate::kPlayerId,
- ShouldDuckFlash() ? media::MediaContentType::Pepper
+ ShouldDuckFlashFoo() ? media::MediaContentType::Pepper
: media::MediaContentType::OneShot);
}
« no previous file with comments | « content/browser/loader/navigation_url_loader.cc ('k') | content/browser/net/network_errors_listing_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698