| 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 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <fcntl.h> | 8 #include <fcntl.h> |
| 9 #endif // defined(OS_LINUX) | 9 #endif // defined(OS_LINUX) |
| 10 | 10 |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 standard_schemes->push_back(kChromeStandardURLSchemes[i]); | 540 standard_schemes->push_back(kChromeStandardURLSchemes[i]); |
| 541 | 541 |
| 542 savable_schemes->push_back(extensions::kExtensionScheme); | 542 savable_schemes->push_back(extensions::kExtensionScheme); |
| 543 savable_schemes->push_back(extensions::kExtensionResourceScheme); | 543 savable_schemes->push_back(extensions::kExtensionResourceScheme); |
| 544 savable_schemes->push_back(chrome::kChromeSearchScheme); | 544 savable_schemes->push_back(chrome::kChromeSearchScheme); |
| 545 savable_schemes->push_back(dom_distiller::kDomDistillerScheme); | 545 savable_schemes->push_back(dom_distiller::kDomDistillerScheme); |
| 546 } | 546 } |
| 547 | 547 |
| 548 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) { | 548 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) { |
| 549 return message->type() == | 549 return message->type() == |
| 550 DataReductionProxyViewHostMsg_DataReductionProxyStatus::ID; | 550 DataReductionProxyViewHostMsg_IsDataReductionProxy::ID; |
| 551 } | 551 } |
| 552 | 552 |
| 553 std::string ChromeContentClient::GetProduct() const { | 553 std::string ChromeContentClient::GetProduct() const { |
| 554 return ::GetProduct(); | 554 return ::GetProduct(); |
| 555 } | 555 } |
| 556 | 556 |
| 557 std::string ChromeContentClient::GetUserAgent() const { | 557 std::string ChromeContentClient::GetUserAgent() const { |
| 558 return ::GetUserAgent(); | 558 return ::GetUserAgent(); |
| 559 } | 559 } |
| 560 | 560 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 schemes->insert(extensions::kExtensionScheme); | 627 schemes->insert(extensions::kExtensionScheme); |
| 628 #endif | 628 #endif |
| 629 } | 629 } |
| 630 | 630 |
| 631 void ChromeContentClient::AddIsolatedSchemes(std::set<std::string>* schemes) { | 631 void ChromeContentClient::AddIsolatedSchemes(std::set<std::string>* schemes) { |
| 632 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 632 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 633 switches::kIsolateExtensions)) { | 633 switches::kIsolateExtensions)) { |
| 634 schemes->insert(extensions::kExtensionScheme); | 634 schemes->insert(extensions::kExtensionScheme); |
| 635 } | 635 } |
| 636 } | 636 } |
| OLD | NEW |