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

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/browser/gpu/gpu_data_manager_impl_private.h" 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 if (update_histograms_) 559 if (update_histograms_)
560 UpdateStats(gpu_info_, gpu_blacklist_.get(), features); 560 UpdateStats(gpu_info_, gpu_blacklist_.get(), features);
561 561
562 UpdateBlacklistedFeatures(features); 562 UpdateBlacklistedFeatures(features);
563 } 563 }
564 if (gpu_driver_bug_list_) { 564 if (gpu_driver_bug_list_) {
565 gpu_driver_bugs_ = gpu_driver_bug_list_->MakeDecision( 565 gpu_driver_bugs_ = gpu_driver_bug_list_->MakeDecision(
566 gpu::GpuControlList::kOsAny, std::string(), gpu_info_); 566 gpu::GpuControlList::kOsAny, std::string(), gpu_info_);
567 567
568 disabled_extensions_ = 568 disabled_extensions_ =
569 JoinString(gpu_driver_bug_list_->GetDisabledExtensions(), ' '); 569 base::JoinString(gpu_driver_bug_list_->GetDisabledExtensions(), " ");
570 } 570 }
571 gpu::GpuDriverBugList::AppendWorkaroundsFromCommandLine( 571 gpu::GpuDriverBugList::AppendWorkaroundsFromCommandLine(
572 &gpu_driver_bugs_, *base::CommandLine::ForCurrentProcess()); 572 &gpu_driver_bugs_, *base::CommandLine::ForCurrentProcess());
573 573
574 // We have to update GpuFeatureType before notify all the observers. 574 // We have to update GpuFeatureType before notify all the observers.
575 NotifyGpuInfoUpdate(); 575 NotifyGpuInfoUpdate();
576 } 576 }
577 577
578 void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) { 578 void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
579 // No further update of gpu_info if falling back to SwiftShader. 579 // No further update of gpu_info if falling back to SwiftShader.
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; 1197 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
1198 #if defined(OS_WIN) 1198 #if defined(OS_WIN)
1199 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; 1199 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
1200 #endif 1200 #endif
1201 complete_gpu_info_already_requested_ = true; 1201 complete_gpu_info_already_requested_ = true;
1202 // Some observers might be waiting. 1202 // Some observers might be waiting.
1203 NotifyGpuInfoUpdate(); 1203 NotifyGpuInfoUpdate();
1204 } 1204 }
1205 1205
1206 } // namespace content 1206 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698