Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 2072383002: Trace revision and v8 version for IterationInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: v8-version Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 605
605 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) { 606 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* message) {
606 return message->type() == 607 return message->type() ==
607 DataReductionProxyViewHostMsg_IsDataReductionProxy::ID; 608 DataReductionProxyViewHostMsg_IsDataReductionProxy::ID;
608 } 609 }
609 610
610 std::string ChromeContentClient::GetProduct() const { 611 std::string ChromeContentClient::GetProduct() const {
611 return ::GetProduct(); 612 return ::GetProduct();
612 } 613 }
613 614
615 std::string ChromeContentClient::GetLastChange() const {
616 return version_info::GetLastChange();
Primiano Tucci (use gerrit) 2016/06/21 06:34:09 Why this plumbing here? This seems to defeat the p
benjhayden 2016/06/21 23:30:36 ** Presubmit ERRORS ** You added one or more #incl
Primiano Tucci (use gerrit) 2016/06/22 08:29:10 Yup, add it to content/browser/tracing/DEPS and th
617 }
618
619 std::string ChromeContentClient::GetV8Version() const {
620 return v8::V8::GetVersion();
621 }
622
614 std::string ChromeContentClient::GetUserAgent() const { 623 std::string ChromeContentClient::GetUserAgent() const {
615 return ::GetUserAgent(); 624 return ::GetUserAgent();
616 } 625 }
617 626
618 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const { 627 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const {
619 return l10n_util::GetStringUTF16(message_id); 628 return l10n_util::GetStringUTF16(message_id);
620 } 629 }
621 630
622 base::StringPiece ChromeContentClient::GetDataResource( 631 base::StringPiece ChromeContentClient::GetDataResource(
623 int resource_id, 632 int resource_id,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 711
703 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { 712 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {
704 return origin_trial_key_manager_.GetPublicKey(); 713 return origin_trial_key_manager_.GetPublicKey();
705 } 714 }
706 715
707 #if defined(OS_ANDROID) 716 #if defined(OS_ANDROID)
708 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { 717 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
709 return new ChromeMediaClientAndroid(); 718 return new ChromeMediaClientAndroid();
710 } 719 }
711 #endif // OS_ANDROID 720 #endif // OS_ANDROID
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698