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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 | 405 |
406 content::PepperPluginInfo plugin; | 406 content::PepperPluginInfo plugin; |
407 if (GetBundledPepperFlash(&plugin)) | 407 if (GetBundledPepperFlash(&plugin)) |
408 plugins->push_back(plugin); | 408 plugins->push_back(plugin); |
409 if (GetSystemPepperFlash(&plugin)) | 409 if (GetSystemPepperFlash(&plugin)) |
410 plugins->push_back(plugin); | 410 plugins->push_back(plugin); |
411 #endif | 411 #endif |
412 } | 412 } |
413 | 413 |
414 void ChromeContentClient::AddAdditionalSchemes( | 414 void ChromeContentClient::AddAdditionalSchemes( |
415 std::vector<std::string>* standard_schemes, | 415 std::vector<url::SchemeWithType>* standard_schemes, |
416 std::vector<std::string>* savable_schemes) { | 416 std::vector<std::string>* savable_schemes) { |
417 standard_schemes->push_back(extensions::kExtensionScheme); | 417 standard_schemes->push_back( |
| 418 url::SchemeWithType(extensions::kExtensionScheme, |
| 419 url::SCHEME_WITHOUT_PORT)); |
418 savable_schemes->push_back(extensions::kExtensionScheme); | 420 savable_schemes->push_back(extensions::kExtensionScheme); |
419 standard_schemes->push_back(chrome::kChromeNativeScheme); | 421 standard_schemes->push_back( |
420 standard_schemes->push_back(extensions::kExtensionResourceScheme); | 422 url::SchemeWithType(chrome::kChromeNativeScheme, |
| 423 url::SCHEME_WITHOUT_PORT)); |
| 424 standard_schemes->push_back( |
| 425 url::SchemeWithType(extensions::kExtensionResourceScheme, |
| 426 url::SCHEME_WITHOUT_PORT)); |
421 savable_schemes->push_back(extensions::kExtensionResourceScheme); | 427 savable_schemes->push_back(extensions::kExtensionResourceScheme); |
422 standard_schemes->push_back(chrome::kChromeSearchScheme); | 428 standard_schemes->push_back( |
| 429 url::SchemeWithType(chrome::kChromeSearchScheme, |
| 430 url::SCHEME_WITHOUT_PORT)); |
423 savable_schemes->push_back(chrome::kChromeSearchScheme); | 431 savable_schemes->push_back(chrome::kChromeSearchScheme); |
424 standard_schemes->push_back(dom_distiller::kDomDistillerScheme); | 432 standard_schemes->push_back( |
| 433 url::SchemeWithType(dom_distiller::kDomDistillerScheme, |
| 434 url::SCHEME_WITHOUT_PORT)); |
425 savable_schemes->push_back(dom_distiller::kDomDistillerScheme); | 435 savable_schemes->push_back(dom_distiller::kDomDistillerScheme); |
426 #if defined(OS_CHROMEOS) | 436 #if defined(OS_CHROMEOS) |
427 standard_schemes->push_back(chrome::kCrosScheme); | 437 standard_schemes->push_back( |
| 438 url::SchemeWithType(chrome::kCrosScheme, |
| 439 url::SCHEME_WITHOUT_PORT)); |
428 #endif | 440 #endif |
429 } | 441 } |
430 | 442 |
431 std::string ChromeContentClient::GetProduct() const { | 443 std::string ChromeContentClient::GetProduct() const { |
432 return ::GetProduct(); | 444 return ::GetProduct(); |
433 } | 445 } |
434 | 446 |
435 std::string ChromeContentClient::GetUserAgent() const { | 447 std::string ChromeContentClient::GetUserAgent() const { |
436 return ::GetUserAgent(); | 448 return ::GetUserAgent(); |
437 } | 449 } |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
492 schemes->insert(content::kChromeUIScheme); | 504 schemes->insert(content::kChromeUIScheme); |
493 schemes->insert(extensions::kExtensionScheme); | 505 schemes->insert(extensions::kExtensionScheme); |
494 schemes->insert(extensions::kExtensionResourceScheme); | 506 schemes->insert(extensions::kExtensionResourceScheme); |
495 GetSecureOriginWhitelist(origins); | 507 GetSecureOriginWhitelist(origins); |
496 } | 508 } |
497 | 509 |
498 void ChromeContentClient::AddServiceWorkerSchemes( | 510 void ChromeContentClient::AddServiceWorkerSchemes( |
499 std::set<std::string>* schemes) { | 511 std::set<std::string>* schemes) { |
500 schemes->insert(extensions::kExtensionScheme); | 512 schemes->insert(extensions::kExtensionScheme); |
501 } | 513 } |
OLD | NEW |