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

Side by Side Diff: chromecast/browser/cast_browser_main_parts.cc

Issue 2871583004: Rename --enable-default-media-session to --enable-audio-focus. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromecast/browser/cast_browser_main_parts.h" 5 #include "chromecast/browser/cast_browser_main_parts.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 #if defined(OS_ANDROID) 218 #if defined(OS_ANDROID)
219 // Disables Chromecast-specific WiFi-related features on ATV for now. 219 // Disables Chromecast-specific WiFi-related features on ATV for now.
220 {switches::kNoWifi, ""}, 220 {switches::kNoWifi, ""},
221 // TODO(714676): this should probably set the no restrictions autoplay 221 // TODO(714676): this should probably set the no restrictions autoplay
222 // policy instead. 222 // policy instead.
223 {switches::kIgnoreAutoplayRestrictionsForTests, ""}, 223 {switches::kIgnoreAutoplayRestrictionsForTests, ""},
224 {switches::kDisableMediaSuspend, ""}, 224 {switches::kDisableMediaSuspend, ""},
225 #else 225 #else
226 // GPU shader disk cache disabling is largely to conserve disk space. 226 // GPU shader disk cache disabling is largely to conserve disk space.
227 {switches::kDisableGpuShaderDiskCache, ""}, 227 {switches::kDisableGpuShaderDiskCache, ""},
228 // Enable media sessions by default (even on non-Android platforms). 228 // Enable audio focus by default (even on non-Android platforms).
229 {switches::kEnableDefaultMediaSession, ""}, 229 {switches::kEnableAudioFocus, ""},
230 #endif 230 #endif
231 #if BUILDFLAG(IS_CAST_AUDIO_ONLY) 231 #if BUILDFLAG(IS_CAST_AUDIO_ONLY)
232 #if defined(OS_ANDROID) 232 #if defined(OS_ANDROID)
233 {switches::kDisableGLDrawingForTests, ""}, 233 {switches::kDisableGLDrawingForTests, ""},
234 #else 234 #else
235 {switches::kDisableGpu, ""}, 235 {switches::kDisableGpu, ""},
236 #endif // defined(OS_ANDROID) 236 #endif // defined(OS_ANDROID)
237 #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) 237 #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
238 #if defined(OS_LINUX) 238 #if defined(OS_LINUX)
239 #if defined(ARCH_CPU_X86_FAMILY) 239 #if defined(ARCH_CPU_X86_FAMILY)
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 566
567 void CastBrowserMainParts::PostDestroyThreads() { 567 void CastBrowserMainParts::PostDestroyThreads() {
568 #if !defined(OS_ANDROID) 568 #if !defined(OS_ANDROID)
569 media_resource_tracker_->FinalizeAndDestroy(); 569 media_resource_tracker_->FinalizeAndDestroy();
570 media_resource_tracker_ = nullptr; 570 media_resource_tracker_ = nullptr;
571 #endif 571 #endif
572 } 572 }
573 573
574 } // namespace shell 574 } // namespace shell
575 } // namespace chromecast 575 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698