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 <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <tuple> | 10 #include <tuple> |
(...skipping 28 matching lines...) Expand all Loading... |
39 #include "content/public/common/content_constants.h" | 39 #include "content/public/common/content_constants.h" |
40 #include "content/public/common/content_switches.h" | 40 #include "content/public/common/content_switches.h" |
41 #include "content/public/common/url_constants.h" | 41 #include "content/public/common/url_constants.h" |
42 #include "content/public/common/user_agent.h" | 42 #include "content/public/common/user_agent.h" |
43 #include "extensions/common/constants.h" | 43 #include "extensions/common/constants.h" |
44 #include "gpu/config/gpu_info.h" | 44 #include "gpu/config/gpu_info.h" |
45 #include "net/http/http_util.h" | 45 #include "net/http/http_util.h" |
46 #include "ui/base/l10n/l10n_util.h" | 46 #include "ui/base/l10n/l10n_util.h" |
47 #include "ui/base/layout.h" | 47 #include "ui/base/layout.h" |
48 #include "ui/base/resource/resource_bundle.h" | 48 #include "ui/base/resource/resource_bundle.h" |
| 49 #include "v8/include/v8.h" |
49 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 50 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
50 | 51 |
51 #if defined(OS_LINUX) | 52 #if defined(OS_LINUX) |
52 #include <fcntl.h> | 53 #include <fcntl.h> |
53 #include "chrome/common/component_flash_hint_file_linux.h" | 54 #include "chrome/common/component_flash_hint_file_linux.h" |
54 #endif // defined(OS_LINUX) | 55 #endif // defined(OS_LINUX) |
55 | 56 |
56 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
57 #include "base/win/windows_version.h" | 58 #include "base/win/windows_version.h" |
58 #endif | 59 #endif |
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 | 611 |
611 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) { | 612 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) { |
612 return message->type() == | 613 return message->type() == |
613 DataReductionProxyViewHostMsg_IsDataReductionProxy::ID; | 614 DataReductionProxyViewHostMsg_IsDataReductionProxy::ID; |
614 } | 615 } |
615 | 616 |
616 std::string ChromeContentClient::GetProduct() const { | 617 std::string ChromeContentClient::GetProduct() const { |
617 return ::GetProduct(); | 618 return ::GetProduct(); |
618 } | 619 } |
619 | 620 |
| 621 std::string ChromeContentClient::GetV8Version() const { |
| 622 return v8::V8::GetVersion(); |
| 623 } |
| 624 |
620 std::string ChromeContentClient::GetUserAgent() const { | 625 std::string ChromeContentClient::GetUserAgent() const { |
621 return ::GetUserAgent(); | 626 return ::GetUserAgent(); |
622 } | 627 } |
623 | 628 |
624 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const { | 629 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const { |
625 return l10n_util::GetStringUTF16(message_id); | 630 return l10n_util::GetStringUTF16(message_id); |
626 } | 631 } |
627 | 632 |
628 base::StringPiece ChromeContentClient::GetDataResource( | 633 base::StringPiece ChromeContentClient::GetDataResource( |
629 int resource_id, | 634 int resource_id, |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
711 origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy()); | 716 origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy()); |
712 } | 717 } |
713 return origin_trial_policy_.get(); | 718 return origin_trial_policy_.get(); |
714 } | 719 } |
715 | 720 |
716 #if defined(OS_ANDROID) | 721 #if defined(OS_ANDROID) |
717 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 722 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
718 return new ChromeMediaClientAndroid(); | 723 return new ChromeMediaClientAndroid(); |
719 } | 724 } |
720 #endif // OS_ANDROID | 725 #endif // OS_ANDROID |
OLD | NEW |