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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 { switches::kForceUseOverlayEmbeddedVideo, ""}, |
49 #endif | 49 #endif |
50 { switches::kDisableApplicationCache, "" }, | 50 { switches::kDisableApplicationCache, "" }, |
51 { switches::kDisablePlugins, "" }, | 51 { switches::kDisablePlugins, "" }, |
52 // Always enable HTMLMediaElement logs. | 52 // Always enable HTMLMediaElement logs. |
53 { switches::kBlinkPlatformLogChannels, "Media"}, | 53 { switches::kBlinkPlatformLogChannels, "Media"}, |
| 54 #if defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) |
| 55 // This is needed for now to enable the egltest Ozone platform to work with |
| 56 // current Linux/NVidia OpenGL drivers. |
| 57 { switches::kIgnoreGpuBlacklist, ""}, |
| 58 #endif |
54 { NULL, NULL }, // Termination | 59 { NULL, NULL }, // Termination |
55 }; | 60 }; |
56 | 61 |
57 void AddDefaultCommandLineSwitches(CommandLine* command_line) { | 62 void AddDefaultCommandLineSwitches(CommandLine* command_line) { |
58 int i = 0; | 63 int i = 0; |
59 while (g_default_switches[i].switch_name != NULL) { | 64 while (g_default_switches[i].switch_name != NULL) { |
60 command_line->AppendSwitchASCII( | 65 command_line->AppendSwitchASCII( |
61 std::string(g_default_switches[i].switch_name), | 66 std::string(g_default_switches[i].switch_name), |
62 std::string(g_default_switches[i].switch_value)); | 67 std::string(g_default_switches[i].switch_value)); |
63 ++i; | 68 ++i; |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 return true; | 158 return true; |
154 } | 159 } |
155 | 160 |
156 void CastBrowserMainParts::PostMainMessageLoopRun() { | 161 void CastBrowserMainParts::PostMainMessageLoopRun() { |
157 cast_browser_process_->cast_service()->Stop(); | 162 cast_browser_process_->cast_service()->Stop(); |
158 cast_browser_process_.reset(); | 163 cast_browser_process_.reset(); |
159 } | 164 } |
160 | 165 |
161 } // namespace shell | 166 } // namespace shell |
162 } // namespace chromecast | 167 } // namespace chromecast |
OLD | NEW |