OLD | NEW |
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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "chromecast/base/metrics/cast_metrics_helper.h" | 10 #include "chromecast/base/metrics/cast_metrics_helper.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 const char* const switch_name; | 38 const char* const switch_name; |
39 const char* const switch_value; | 39 const char* const switch_value; |
40 }; | 40 }; |
41 | 41 |
42 DefaultCommandLineSwitch g_default_switches[] = { | 42 DefaultCommandLineSwitch g_default_switches[] = { |
43 #if defined(OS_ANDROID) | 43 #if defined(OS_ANDROID) |
44 { switches::kMediaDrmEnableNonCompositing, ""}, | 44 { switches::kMediaDrmEnableNonCompositing, ""}, |
45 { switches::kEnableOverlayFullscreenVideo, ""}, | 45 { switches::kEnableOverlayFullscreenVideo, ""}, |
46 { switches::kDisableInfobarForProtectedMediaIdentifier, ""}, | 46 { switches::kDisableInfobarForProtectedMediaIdentifier, ""}, |
47 { switches::kDisableGestureRequirementForMediaPlayback, ""}, | 47 { switches::kDisableGestureRequirementForMediaPlayback, ""}, |
| 48 { switches::kForceUseOverlayEmbeddedVideo, ""}, |
48 #endif | 49 #endif |
49 { switches::kDisableApplicationCache, "" }, | 50 { switches::kDisableApplicationCache, "" }, |
50 { switches::kDisablePlugins, "" }, | 51 { switches::kDisablePlugins, "" }, |
51 // Always enable HTMLMediaElement logs. | 52 // Always enable HTMLMediaElement logs. |
52 { switches::kBlinkPlatformLogChannels, "Media"}, | 53 { switches::kBlinkPlatformLogChannels, "Media"}, |
53 { NULL, NULL }, // Termination | 54 { NULL, NULL }, // Termination |
54 }; | 55 }; |
55 | 56 |
56 void AddDefaultCommandLineSwitches(CommandLine* command_line) { | 57 void AddDefaultCommandLineSwitches(CommandLine* command_line) { |
57 int i = 0; | 58 int i = 0; |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 return true; | 153 return true; |
153 } | 154 } |
154 | 155 |
155 void CastBrowserMainParts::PostMainMessageLoopRun() { | 156 void CastBrowserMainParts::PostMainMessageLoopRun() { |
156 cast_browser_process_->cast_service()->Stop(); | 157 cast_browser_process_->cast_service()->Stop(); |
157 cast_browser_process_.reset(); | 158 cast_browser_process_.reset(); |
158 } | 159 } |
159 | 160 |
160 } // namespace shell | 161 } // namespace shell |
161 } // namespace chromecast | 162 } // namespace chromecast |
OLD | NEW |