diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 19:05:34 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 19:05:34 +0000 |
| commit | f11fbb71d9671e0f6582fa4977b8dcf1ad43d858 (patch) | |
| tree | 8e13e780d3b1b6c8031eb022e55255eb7f5e8818 /chrome/browser/gpu_blacklist.cc | |
| parent | 2907f9ed41450a86128fc956e007c2488f9bfaa1 (diff) | |
| download | chromium_src-f11fbb71d9671e0f6582fa4977b8dcf1ad43d858.zip chromium_src-f11fbb71d9671e0f6582fa4977b8dcf1ad43d858.tar.gz chromium_src-f11fbb71d9671e0f6582fa4977b8dcf1ad43d858.tar.bz2 | |
Move chrome_version info retrieval into GpuBlacklist.
Originally we have to retrieve it and pass it to Blacklist as a parameter; this was because GpuBlacklist is on the content side where chrome version is not visible.
Now we moved blacklist to chrome side, so we could handle the chrome version retrieval inside GpuBlacklist. This makes testing simpler as we don't have to provide fake chrome version string.
BUG=
TEST=waterfall
R=jbates
Review URL: https://chromiumcodereview.appspot.com/9668015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_blacklist.cc')
| -rw-r--r-- | chrome/browser/gpu_blacklist.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/gpu_blacklist.cc b/chrome/browser/gpu_blacklist.cc index 0f59815..efeb7f3 100644 --- a/chrome/browser/gpu_blacklist.cc +++ b/chrome/browser/gpu_blacklist.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,6 +13,7 @@ #include "base/sys_info.h" #include "base/version.h" #include "chrome/browser/gpu_util.h" +#include "chrome/common/chrome_version_info.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/common/content_switches.h" #include "content/public/common/gpu_info.h" @@ -750,6 +751,14 @@ GpuBlacklist::~GpuBlacklist() { } bool GpuBlacklist::LoadGpuBlacklist( + const std::string& json_context, GpuBlacklist::OsFilter os_filter) { + chrome::VersionInfo chrome_version_info; + std::string chrome_version_string = + chrome_version_info.is_valid() ? chrome_version_info.Version() : "0"; + return LoadGpuBlacklist(chrome_version_string, json_context, os_filter); +} + +bool GpuBlacklist::LoadGpuBlacklist( const std::string& browser_version_string, const std::string& json_context, GpuBlacklist::OsFilter os_filter) { |