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 17 matching lines...) Expand all Loading... | |
28 #include "chromecast/crash/android/crash_handler.h" | 28 #include "chromecast/crash/android/crash_handler.h" |
29 #include "components/crash/browser/crash_dump_manager_android.h" | 29 #include "components/crash/browser/crash_dump_manager_android.h" |
30 #include "net/android/network_change_notifier_factory_android.h" | 30 #include "net/android/network_change_notifier_factory_android.h" |
31 #endif // defined(OS_ANDROID) | 31 #endif // defined(OS_ANDROID) |
32 | 32 |
33 namespace chromecast { | 33 namespace chromecast { |
34 namespace shell { | 34 namespace shell { |
35 | 35 |
36 namespace { | 36 namespace { |
37 | 37 |
38 // also defined in cc/base/switches.h but adding here due to checkdeps rules. | |
39 const char kUIDisablePartialSwap[] = "ui-disable-partial-swap"; | |
lcwu1
2014/10/31 17:37:31
We shouldn't define our own switch string here (as
| |
40 | |
38 struct DefaultCommandLineSwitch { | 41 struct DefaultCommandLineSwitch { |
39 const char* const switch_name; | 42 const char* const switch_name; |
40 const char* const switch_value; | 43 const char* const switch_value; |
41 }; | 44 }; |
42 | 45 |
43 DefaultCommandLineSwitch g_default_switches[] = { | 46 DefaultCommandLineSwitch g_default_switches[] = { |
44 #if defined(OS_ANDROID) | 47 #if defined(OS_ANDROID) |
45 { switches::kMediaDrmEnableNonCompositing, ""}, | 48 { switches::kMediaDrmEnableNonCompositing, ""}, |
46 { switches::kEnableOverlayFullscreenVideo, ""}, | 49 { switches::kEnableOverlayFullscreenVideo, ""}, |
47 { switches::kDisableInfobarForProtectedMediaIdentifier, ""}, | 50 { switches::kDisableInfobarForProtectedMediaIdentifier, ""}, |
48 { switches::kDisableGestureRequirementForMediaPlayback, ""}, | 51 { switches::kDisableGestureRequirementForMediaPlayback, ""}, |
49 { switches::kForceUseOverlayEmbeddedVideo, ""}, | 52 { switches::kForceUseOverlayEmbeddedVideo, ""}, |
50 #endif | 53 #endif |
51 { switches::kDisableApplicationCache, "" }, | 54 { switches::kDisableApplicationCache, "" }, |
52 { switches::kDisablePlugins, "" }, | 55 { switches::kDisablePlugins, "" }, |
53 // Always enable HTMLMediaElement logs. | 56 // Always enable HTMLMediaElement logs. |
54 { switches::kBlinkPlatformLogChannels, "Media"}, | 57 { switches::kBlinkPlatformLogChannels, "Media"}, |
55 #if defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) | 58 #if defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) |
56 // This is needed for now to enable the egltest Ozone platform to work with | 59 // This is needed for now to enable the egltest Ozone platform to work with |
57 // current Linux/NVidia OpenGL drivers. | 60 // current Linux/NVidia OpenGL drivers. |
58 { switches::kIgnoreGpuBlacklist, ""}, | 61 { switches::kIgnoreGpuBlacklist, ""}, |
62 // TODO(gusfernandez): This is needed to fix a bug with | |
63 // glPostSubBufferCHROMIUM (crbug: 429200) | |
lcwu1
2014/10/31 17:37:31
The convention of specifying a crbug is crbug.com/
| |
64 { kUIDisablePartialSwap, ""}, | |
59 #endif | 65 #endif |
60 { NULL, NULL }, // Termination | 66 { NULL, NULL }, // Termination |
61 }; | 67 }; |
62 | 68 |
63 void AddDefaultCommandLineSwitches(CommandLine* command_line) { | 69 void AddDefaultCommandLineSwitches(CommandLine* command_line) { |
64 int i = 0; | 70 int i = 0; |
65 while (g_default_switches[i].switch_name != NULL) { | 71 while (g_default_switches[i].switch_name != NULL) { |
66 command_line->AppendSwitchASCII( | 72 command_line->AppendSwitchASCII( |
67 std::string(g_default_switches[i].switch_name), | 73 std::string(g_default_switches[i].switch_name), |
68 std::string(g_default_switches[i].switch_value)); | 74 std::string(g_default_switches[i].switch_value)); |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
163 return true; | 169 return true; |
164 } | 170 } |
165 | 171 |
166 void CastBrowserMainParts::PostMainMessageLoopRun() { | 172 void CastBrowserMainParts::PostMainMessageLoopRun() { |
167 cast_browser_process_->cast_service()->Stop(); | 173 cast_browser_process_->cast_service()->Stop(); |
168 cast_browser_process_.reset(); | 174 cast_browser_process_.reset(); |
169 } | 175 } |
170 | 176 |
171 } // namespace shell | 177 } // namespace shell |
172 } // namespace chromecast | 178 } // namespace chromecast |
OLD | NEW |