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/renderer/cast_content_renderer_client.h" | 5 #include "chromecast/shell/renderer/cast_content_renderer_client.h" |
6 | 6 |
7 #include <sys/sysinfo.h> | 7 #include <sys/sysinfo.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/memory_pressure_listener.h" | 10 #include "base/memory/memory_pressure_listener.h" |
11 #include "chromecast/shell/renderer/key_systems_cast.h" | 11 #include "chromecast/shell/renderer/key_systems_cast.h" |
12 #include "content/public/common/content_switches.h" | 12 #include "content/public/common/content_switches.h" |
13 #include "content/public/renderer/render_view.h" | 13 #include "content/public/renderer/render_view.h" |
14 #include "crypto/nss_util.h" | 14 #include "crypto/nss_util.h" |
15 #include "third_party/WebKit/public/platform/WebColor.h" | 15 #include "third_party/WebKit/public/platform/WebColor.h" |
16 #include "third_party/WebKit/public/web/WebSettings.h" | 16 #include "third_party/WebKit/public/web/WebSettings.h" |
17 #include "third_party/WebKit/public/web/WebView.h" | 17 #include "third_party/WebKit/public/web/WebView.h" |
18 | 18 |
19 namespace chromecast { | 19 namespace chromecast { |
20 namespace shell { | 20 namespace shell { |
21 | 21 |
22 namespace { | 22 namespace { |
23 | 23 |
24 // Default background color to set for WebViews | 24 // Default background color to set for WebViews. WebColor is in ARGB format |
25 const blink::WebColor kColorBlack = 0x000000FF; | 25 // though the comment of WebColor says it is in RGBA. |
| 26 const blink::WebColor kColorBlack = 0xFF000000; |
26 | 27 |
27 } // namespace | 28 } // namespace |
28 | 29 |
29 void CastContentRendererClient::RenderThreadStarted() { | 30 void CastContentRendererClient::RenderThreadStarted() { |
30 #if defined(USE_NSS) | 31 #if defined(USE_NSS) |
31 // Note: Copied from chrome_render_process_observer.cc to fix b/8676652. | 32 // Note: Copied from chrome_render_process_observer.cc to fix b/8676652. |
32 // | 33 // |
33 // On platforms where the system NSS shared libraries are used, | 34 // On platforms where the system NSS shared libraries are used, |
34 // initialize NSS now because it won't be able to load the .so's | 35 // initialize NSS now because it won't be able to load the .so's |
35 // after entering the sandbox. | 36 // after entering the sandbox. |
(...skipping 12 matching lines...) Expand all Loading... |
48 } | 49 } |
49 | 50 |
50 void CastContentRendererClient::AddKeySystems( | 51 void CastContentRendererClient::AddKeySystems( |
51 std::vector<content::KeySystemInfo>* key_systems) { | 52 std::vector<content::KeySystemInfo>* key_systems) { |
52 AddChromecastKeySystems(key_systems); | 53 AddChromecastKeySystems(key_systems); |
53 AddChromecastPlatformKeySystems(key_systems); | 54 AddChromecastPlatformKeySystems(key_systems); |
54 } | 55 } |
55 | 56 |
56 } // namespace shell | 57 } // namespace shell |
57 } // namespace chromecast | 58 } // namespace chromecast |
OLD | NEW |