OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/common/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
19 #include "chrome/common/child_process_logging.h" | 19 #include "chrome/common/child_process_logging.h" |
20 #include "chrome/common/chrome_constants.h" | 20 #include "chrome/common/chrome_constants.h" |
21 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
22 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
23 #include "chrome/common/chrome_version_info.h" | 23 #include "chrome/common/chrome_version_info.h" |
24 #include "chrome/common/crash_keys.h" | 24 #include "chrome/common/crash_keys.h" |
25 #include "chrome/common/pepper_flash.h" | 25 #include "chrome/common/pepper_flash.h" |
26 #include "chrome/common/render_messages.h" | 26 #include "chrome/common/render_messages.h" |
| 27 #include "chrome/common/secure_origin_whitelist.h" |
27 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
28 #include "chrome/grit/common_resources.h" | 29 #include "chrome/grit/common_resources.h" |
29 #include "components/dom_distiller/core/url_constants.h" | 30 #include "components/dom_distiller/core/url_constants.h" |
30 #include "content/public/common/content_constants.h" | 31 #include "content/public/common/content_constants.h" |
31 #include "content/public/common/content_switches.h" | 32 #include "content/public/common/content_switches.h" |
32 #include "content/public/common/url_constants.h" | 33 #include "content/public/common/url_constants.h" |
33 #include "content/public/common/user_agent.h" | 34 #include "content/public/common/user_agent.h" |
34 #include "extensions/common/constants.h" | 35 #include "extensions/common/constants.h" |
35 #include "gpu/config/gpu_info.h" | 36 #include "gpu/config/gpu_info.h" |
36 #include "net/http/http_util.h" | 37 #include "net/http/http_util.h" |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
551 return false; | 552 return false; |
552 } | 553 } |
553 #endif | 554 #endif |
554 | 555 |
555 void ChromeContentClient::AddSecureSchemesAndOrigins( | 556 void ChromeContentClient::AddSecureSchemesAndOrigins( |
556 std::set<std::string>* schemes, | 557 std::set<std::string>* schemes, |
557 std::set<GURL>* origins) { | 558 std::set<GURL>* origins) { |
558 schemes->insert(content::kChromeUIScheme); | 559 schemes->insert(content::kChromeUIScheme); |
559 schemes->insert(extensions::kExtensionScheme); | 560 schemes->insert(extensions::kExtensionScheme); |
560 schemes->insert(extensions::kExtensionResourceScheme); | 561 schemes->insert(extensions::kExtensionResourceScheme); |
561 | 562 GetSecureOriginWhitelist(origins); |
562 // TODO(kinuko): Handle command-line options for whitelisting | |
563 // insecure origins. crbug.com/441605 | |
564 } | 563 } |
OLD | NEW |