| 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/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 webkit::npapi::PluginList* plugin_list) { | 374 webkit::npapi::PluginList* plugin_list) { |
| 375 } | 375 } |
| 376 | 376 |
| 377 void ChromeContentClient::AddAdditionalSchemes( | 377 void ChromeContentClient::AddAdditionalSchemes( |
| 378 std::vector<std::string>* standard_schemes, | 378 std::vector<std::string>* standard_schemes, |
| 379 std::vector<std::string>* savable_schemes) { | 379 std::vector<std::string>* savable_schemes) { |
| 380 standard_schemes->push_back(extensions::kExtensionScheme); | 380 standard_schemes->push_back(extensions::kExtensionScheme); |
| 381 savable_schemes->push_back(extensions::kExtensionScheme); | 381 savable_schemes->push_back(extensions::kExtensionScheme); |
| 382 standard_schemes->push_back(kExtensionResourceScheme); | 382 standard_schemes->push_back(kExtensionResourceScheme); |
| 383 savable_schemes->push_back(kExtensionResourceScheme); | 383 savable_schemes->push_back(kExtensionResourceScheme); |
| 384 standard_schemes->push_back(chrome::kChromeSearchScheme); |
| 384 #if defined(OS_CHROMEOS) | 385 #if defined(OS_CHROMEOS) |
| 385 standard_schemes->push_back(kCrosScheme); | 386 standard_schemes->push_back(kCrosScheme); |
| 386 #endif | 387 #endif |
| 387 } | 388 } |
| 388 | 389 |
| 389 bool ChromeContentClient::CanHandleWhileSwappedOut( | 390 bool ChromeContentClient::CanHandleWhileSwappedOut( |
| 390 const IPC::Message& msg) { | 391 const IPC::Message& msg) { |
| 391 // Any Chrome-specific messages (apart from those listed in | 392 // Any Chrome-specific messages (apart from those listed in |
| 392 // CanSendWhileSwappedOut) that must be handled by the browser when sent from | 393 // CanSendWhileSwappedOut) that must be handled by the browser when sent from |
| 393 // swapped out renderers. | 394 // swapped out renderers. |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 } | 449 } |
| 449 return false; | 450 return false; |
| 450 } | 451 } |
| 451 | 452 |
| 452 std::string ChromeContentClient::GetCarbonInterposePath() const { | 453 std::string ChromeContentClient::GetCarbonInterposePath() const { |
| 453 return std::string(kInterposeLibraryPath); | 454 return std::string(kInterposeLibraryPath); |
| 454 } | 455 } |
| 455 #endif | 456 #endif |
| 456 | 457 |
| 457 } // namespace chrome | 458 } // namespace chrome |
| OLD | NEW |