diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-19 13:26:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-04 10:20:43 +0200 |
commit | 9747fbdc8f1b55cc9a4002861c47a1c10bc9d90f (patch) | |
tree | 2126b49ff7039874e78c1c22696e0859fc9c85c5 | |
parent | 0dd2d10a36785f980514e42bf9e57a326c644f2c (diff) | |
download | qtwebengine-chromium-9747fbdc8f1b55cc9a4002861c47a1c10bc9d90f.tar.gz |
Fixes for universal build
Three missing symbols and a load of warnings.
Change-Id: Ib8b5ea0aec3f2f39ea8625627eb0cd249defbc54
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r-- | chromium/components/performance_manager/decorators/site_data_recorder.cc | 4 | ||||
-rw-r--r-- | chromium/components/variations/net/variations_command_line.cc | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chromium/components/performance_manager/decorators/site_data_recorder.cc b/chromium/components/performance_manager/decorators/site_data_recorder.cc index aa39f00fc4d..d48d1a821fa 100644 --- a/chromium/components/performance_manager/decorators/site_data_recorder.cc +++ b/chromium/components/performance_manager/decorators/site_data_recorder.cc @@ -363,8 +363,8 @@ void SiteDataRecorder::SetPageNodeDataCache(const PageNode* page_node) { page_node->GetBrowserContextID())); } -SiteDataNodeData::Data::Data() = default; -SiteDataNodeData::Data::~Data() = default; +SiteDataRecorder::Data::Data() = default; +SiteDataRecorder::Data::~Data() = default; // static const SiteDataRecorder::Data* SiteDataRecorder::Data::FromPageNode( diff --git a/chromium/components/variations/net/variations_command_line.cc b/chromium/components/variations/net/variations_command_line.cc index b515f16cd43..c81e304f0be 100644 --- a/chromium/components/variations/net/variations_command_line.cc +++ b/chromium/components/variations/net/variations_command_line.cc @@ -13,6 +13,7 @@ namespace variations { +#ifndef TOOLKIT_QT namespace { // Format the provided |param_key| and |param_value| as commandline input. @@ -25,8 +26,10 @@ std::string GenerateParam(const std::string& param_key, } } // namespace +#endif std::string GetVariationsCommandLine() { +#ifndef TOOLKIT_QT std::string field_trial_states; base::FieldTrialList::AllStatesToString(&field_trial_states, true); @@ -45,6 +48,9 @@ std::string GetVariationsCommandLine() { GenerateParam(switches::kForceFieldTrialParams, field_trial_params)); output.append(GenerateParam(::switches::kEnableFeatures, enable_features)); output.append(GenerateParam(::switches::kDisableFeatures, disable_features)); +#else + std::string output; +#endif return output; } |