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/shell/browser/cast_browser_main_parts.h" | 5 #include "chromecast/shell/browser/cast_browser_main_parts.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chromecast/net/network_change_notifier_cast.h" | 8 #include "chromecast/net/network_change_notifier_cast.h" |
9 #include "chromecast/net/network_change_notifier_factory_cast.h" | 9 #include "chromecast/net/network_change_notifier_factory_cast.h" |
10 #include "chromecast/service/cast_service.h" | 10 #include "chromecast/service/cast_service.h" |
11 #include "chromecast/shell/browser/cast_browser_context.h" | 11 #include "chromecast/shell/browser/cast_browser_context.h" |
12 #include "chromecast/shell/browser/url_request_context_factory.h" | 12 #include "chromecast/shell/browser/url_request_context_factory.h" |
13 #include "content/public/common/content_switches.h" | |
13 | 14 |
14 namespace chromecast { | 15 namespace chromecast { |
15 namespace shell { | 16 namespace shell { |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 struct DefaultCommandLineSwitch { | 20 struct DefaultCommandLineSwitch { |
20 const char* const switch_name; | 21 const char* const switch_name; |
21 const char* const switch_value; | 22 const char* const switch_value; |
22 }; | 23 }; |
23 | 24 |
24 DefaultCommandLineSwitch g_default_switches[] = { | 25 DefaultCommandLineSwitch g_default_switches[] = { |
25 { "enable-webrtc-hw-decoding", "" }, | 26 { switches::kDisableApplicationCache, "" }, |
26 { "disable-plugins", "" }, | 27 { switches::kDisablePlugins, "" }, |
27 { "enable-threaded-compositing", "" }, | 28 { switches::kEnableThreadedCompositing, "" }, |
lcwu1
2014/08/14 20:39:50
This flag is no longer needed as threaded composit
gunsch
2014/08/14 20:44:59
Done.
| |
28 { NULL, NULL }, // Termination | 29 { NULL, NULL }, // Termination |
29 }; | 30 }; |
30 | 31 |
31 void AddDefaultCommandLineSwitches(CommandLine* command_line) { | 32 void AddDefaultCommandLineSwitches(CommandLine* command_line) { |
32 int i = 0; | 33 int i = 0; |
33 while (g_default_switches[i].switch_name != NULL) { | 34 while (g_default_switches[i].switch_name != NULL) { |
34 command_line->AppendSwitchASCII( | 35 command_line->AppendSwitchASCII( |
35 std::string(g_default_switches[i].switch_name), | 36 std::string(g_default_switches[i].switch_name), |
36 std::string(g_default_switches[i].switch_value)); | 37 std::string(g_default_switches[i].switch_value)); |
37 ++i; | 38 ++i; |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
79 return true; | 80 return true; |
80 } | 81 } |
81 | 82 |
82 void CastBrowserMainParts::PostMainMessageLoopRun() { | 83 void CastBrowserMainParts::PostMainMessageLoopRun() { |
83 cast_service_->Stop(); | 84 cast_service_->Stop(); |
84 browser_context_.reset(); | 85 browser_context_.reset(); |
85 } | 86 } |
86 | 87 |
87 } // namespace shell | 88 } // namespace shell |
88 } // namespace chromecast | 89 } // namespace chromecast |
OLD | NEW |