| 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/cpu.h" | 8 #include "base/cpu.h" |
| 9 #include "base/debug/crash_logging.h" | 9 #include "base/debug/crash_logging.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 content::PepperPluginInfo plugin; | 472 content::PepperPluginInfo plugin; |
| 473 if (GetBundledPepperFlash(&plugin)) | 473 if (GetBundledPepperFlash(&plugin)) |
| 474 plugins->push_back(plugin); | 474 plugins->push_back(plugin); |
| 475 } | 475 } |
| 476 | 476 |
| 477 void ChromeContentClient::AddAdditionalSchemes( | 477 void ChromeContentClient::AddAdditionalSchemes( |
| 478 std::vector<std::string>* standard_schemes, | 478 std::vector<std::string>* standard_schemes, |
| 479 std::vector<std::string>* savable_schemes) { | 479 std::vector<std::string>* savable_schemes) { |
| 480 standard_schemes->push_back(extensions::kExtensionScheme); | 480 standard_schemes->push_back(extensions::kExtensionScheme); |
| 481 savable_schemes->push_back(extensions::kExtensionScheme); | 481 savable_schemes->push_back(extensions::kExtensionScheme); |
| 482 standard_schemes->push_back(chrome::kChromeNativeScheme); |
| 482 standard_schemes->push_back(extensions::kExtensionResourceScheme); | 483 standard_schemes->push_back(extensions::kExtensionResourceScheme); |
| 483 savable_schemes->push_back(extensions::kExtensionResourceScheme); | 484 savable_schemes->push_back(extensions::kExtensionResourceScheme); |
| 484 standard_schemes->push_back(chrome::kChromeSearchScheme); | 485 standard_schemes->push_back(chrome::kChromeSearchScheme); |
| 485 savable_schemes->push_back(chrome::kChromeSearchScheme); | 486 savable_schemes->push_back(chrome::kChromeSearchScheme); |
| 486 standard_schemes->push_back(chrome::kDomDistillerScheme); | 487 standard_schemes->push_back(chrome::kDomDistillerScheme); |
| 487 savable_schemes->push_back(chrome::kDomDistillerScheme); | 488 savable_schemes->push_back(chrome::kDomDistillerScheme); |
| 488 #if defined(OS_CHROMEOS) | 489 #if defined(OS_CHROMEOS) |
| 489 standard_schemes->push_back(chrome::kCrosScheme); | 490 standard_schemes->push_back(chrome::kCrosScheme); |
| 490 #endif | 491 #endif |
| 491 } | 492 } |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; | 548 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; |
| 548 return true; | 549 return true; |
| 549 } | 550 } |
| 550 return false; | 551 return false; |
| 551 } | 552 } |
| 552 | 553 |
| 553 std::string ChromeContentClient::GetCarbonInterposePath() const { | 554 std::string ChromeContentClient::GetCarbonInterposePath() const { |
| 554 return std::string(kInterposeLibraryPath); | 555 return std::string(kInterposeLibraryPath); |
| 555 } | 556 } |
| 556 #endif | 557 #endif |
| OLD | NEW |