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

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

Issue 1139823007: Remove obsolete use of kDisableInfobarForProtectedMediaIdentifier in Cast for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 7 #include <string>
8 #if !defined(OS_ANDROID) 8 #if !defined(OS_ANDROID)
9 #include <signal.h> 9 #include <signal.h>
10 #include <sys/prctl.h> 10 #include <sys/prctl.h>
(...skipping 23 matching lines...) Expand all
34 #include "chromecast/media/base/key_systems_common.h" 34 #include "chromecast/media/base/key_systems_common.h"
35 #include "chromecast/net/connectivity_checker.h" 35 #include "chromecast/net/connectivity_checker.h"
36 #include "chromecast/public/cast_media_shlib.h" 36 #include "chromecast/public/cast_media_shlib.h"
37 #include "chromecast/public/cast_sys_info.h" 37 #include "chromecast/public/cast_sys_info.h"
38 #include "content/public/browser/browser_thread.h" 38 #include "content/public/browser/browser_thread.h"
39 #include "content/public/browser/gpu_data_manager.h" 39 #include "content/public/browser/gpu_data_manager.h"
40 #include "content/public/common/content_switches.h" 40 #include "content/public/common/content_switches.h"
41 #include "media/audio/audio_manager.h" 41 #include "media/audio/audio_manager.h"
42 #include "media/audio/audio_manager_factory.h" 42 #include "media/audio/audio_manager_factory.h"
43 #include "media/base/browser_cdm_factory.h" 43 #include "media/base/browser_cdm_factory.h"
44 #include "media/base/media_switches.h"
45 44
46 #if defined(OS_ANDROID) 45 #if defined(OS_ANDROID)
47 #include "chromecast/browser/media/cast_media_client_android.h" 46 #include "chromecast/browser/media/cast_media_client_android.h"
48 #include "chromecast/crash/android/crash_handler.h" 47 #include "chromecast/crash/android/crash_handler.h"
49 #include "components/crash/browser/crash_dump_manager_android.h" 48 #include "components/crash/browser/crash_dump_manager_android.h"
50 #include "media/base/android/media_client_android.h" 49 #include "media/base/android/media_client_android.h"
51 #include "net/android/network_change_notifier_factory_android.h" 50 #include "net/android/network_change_notifier_factory_android.h"
52 #else 51 #else
53 #include "chromecast/browser/media/cast_browser_cdm_factory.h" 52 #include "chromecast/browser/media/cast_browser_cdm_factory.h"
54 #include "chromecast/net/network_change_notifier_factory_cast.h" 53 #include "chromecast/net/network_change_notifier_factory_cast.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 struct DefaultCommandLineSwitch { 155 struct DefaultCommandLineSwitch {
157 const char* const switch_name; 156 const char* const switch_name;
158 const char* const switch_value; 157 const char* const switch_value;
159 }; 158 };
160 159
161 DefaultCommandLineSwitch g_default_switches[] = { 160 DefaultCommandLineSwitch g_default_switches[] = {
162 #if defined(OS_ANDROID) 161 #if defined(OS_ANDROID)
163 // Disables Chromecast-specific WiFi-related features on ATV for now. 162 // Disables Chromecast-specific WiFi-related features on ATV for now.
164 { switches::kNoWifi, "" }, 163 { switches::kNoWifi, "" },
165 { switches::kEnableOverlayFullscreenVideo, ""}, 164 { switches::kEnableOverlayFullscreenVideo, ""},
166 { switches::kDisableInfobarForProtectedMediaIdentifier, ""},
167 { switches::kDisableGestureRequirementForMediaPlayback, ""}, 165 { switches::kDisableGestureRequirementForMediaPlayback, ""},
168 #endif 166 #endif
169 // Always enable HTMLMediaElement logs. 167 // Always enable HTMLMediaElement logs.
170 { switches::kBlinkPlatformLogChannels, "Media"}, 168 { switches::kBlinkPlatformLogChannels, "Media"},
171 #if defined(DISABLE_DISPLAY) 169 #if defined(DISABLE_DISPLAY)
172 { switches::kDisableGpu, "" }, 170 { switches::kDisableGpu, "" },
173 #endif 171 #endif
174 #if defined(OS_LINUX) 172 #if defined(OS_LINUX)
175 #if defined(ARCH_CPU_X86_FAMILY) 173 #if defined(ARCH_CPU_X86_FAMILY)
176 // This is needed for now to enable the egltest Ozone platform to work with 174 // This is needed for now to enable the egltest Ozone platform to work with
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 #endif 378 #endif
381 379
382 DeregisterKillOnAlarm(); 380 DeregisterKillOnAlarm();
383 #endif 381 #endif
384 382
385 media::CastMediaShlib::Finalize(); 383 media::CastMediaShlib::Finalize();
386 } 384 }
387 385
388 } // namespace shell 386 } // namespace shell
389 } // namespace chromecast 387 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698