| 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" |
| (...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 return true; | 543 return true; |
| 544 } | 544 } |
| 545 #endif | 545 #endif |
| 546 return false; | 546 return false; |
| 547 } | 547 } |
| 548 #endif | 548 #endif |
| 549 | 549 |
| 550 void ChromeContentClient::AddSecureSchemesAndOrigins( | 550 void ChromeContentClient::AddSecureSchemesAndOrigins( |
| 551 std::set<std::string>* schemes, | 551 std::set<std::string>* schemes, |
| 552 std::set<GURL>* origins) { | 552 std::set<GURL>* origins) { |
| 553 schemes->insert(chrome::kChromeSearchScheme); |
| 553 schemes->insert(content::kChromeUIScheme); | 554 schemes->insert(content::kChromeUIScheme); |
| 554 schemes->insert(extensions::kExtensionScheme); | 555 schemes->insert(extensions::kExtensionScheme); |
| 555 schemes->insert(extensions::kExtensionResourceScheme); | 556 schemes->insert(extensions::kExtensionResourceScheme); |
| 556 GetSecureOriginWhitelist(origins); | 557 GetSecureOriginWhitelist(origins); |
| 557 } | 558 } |
| OLD | NEW |