| 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 460 | 460 |
| 461 void ChromeContentClient::AddAdditionalSchemes( | 461 void ChromeContentClient::AddAdditionalSchemes( |
| 462 std::vector<std::string>* standard_schemes, | 462 std::vector<std::string>* standard_schemes, |
| 463 std::vector<std::string>* savable_schemes) { | 463 std::vector<std::string>* savable_schemes) { |
| 464 standard_schemes->push_back(extensions::kExtensionScheme); | 464 standard_schemes->push_back(extensions::kExtensionScheme); |
| 465 savable_schemes->push_back(extensions::kExtensionScheme); | 465 savable_schemes->push_back(extensions::kExtensionScheme); |
| 466 standard_schemes->push_back(extensions::kExtensionResourceScheme); | 466 standard_schemes->push_back(extensions::kExtensionResourceScheme); |
| 467 savable_schemes->push_back(extensions::kExtensionResourceScheme); | 467 savable_schemes->push_back(extensions::kExtensionResourceScheme); |
| 468 standard_schemes->push_back(chrome::kChromeSearchScheme); | 468 standard_schemes->push_back(chrome::kChromeSearchScheme); |
| 469 savable_schemes->push_back(chrome::kChromeSearchScheme); | 469 savable_schemes->push_back(chrome::kChromeSearchScheme); |
| 470 standard_schemes->push_back(chrome::kDomDistillerScheme); |
| 471 savable_schemes->push_back(chrome::kDomDistillerScheme); |
| 470 #if defined(OS_CHROMEOS) | 472 #if defined(OS_CHROMEOS) |
| 471 standard_schemes->push_back(chrome::kCrosScheme); | 473 standard_schemes->push_back(chrome::kCrosScheme); |
| 472 #endif | 474 #endif |
| 473 } | 475 } |
| 474 | 476 |
| 475 bool ChromeContentClient::CanHandleWhileSwappedOut( | 477 bool ChromeContentClient::CanHandleWhileSwappedOut( |
| 476 const IPC::Message& msg) { | 478 const IPC::Message& msg) { |
| 477 // Any Chrome-specific messages (apart from those listed in | 479 // Any Chrome-specific messages (apart from those listed in |
| 478 // CanSendWhileSwappedOut) that must be handled by the browser when sent from | 480 // CanSendWhileSwappedOut) that must be handled by the browser when sent from |
| 479 // swapped out renderers. | 481 // swapped out renderers. |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; | 539 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; |
| 538 return true; | 540 return true; |
| 539 } | 541 } |
| 540 return false; | 542 return false; |
| 541 } | 543 } |
| 542 | 544 |
| 543 std::string ChromeContentClient::GetCarbonInterposePath() const { | 545 std::string ChromeContentClient::GetCarbonInterposePath() const { |
| 544 return std::string(kInterposeLibraryPath); | 546 return std::string(kInterposeLibraryPath); |
| 545 } | 547 } |
| 546 #endif | 548 #endif |
| OLD | NEW |