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

Unified Diff: chrome/browser/chrome_gpu_util.cc

Issue 10911315: Move gpu blacklist data file to content side. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_gpu_util.cc
===================================================================
--- chrome/browser/chrome_gpu_util.cc (revision 156701)
+++ chrome/browser/chrome_gpu_util.cc (working copy)
@@ -16,8 +16,6 @@
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/content_switches.h"
-#include "grit/browser_resources.h"
-#include "ui/base/resource/resource_bundle.h"
using content::GpuDataManager;
@@ -122,27 +120,5 @@
UMA_HISTOGRAM_BOOLEAN("GPU.InCompositorThreadFieldTrial", thread);
}
-// Load GPU Blacklist, collect preliminary gpu info, and compute preliminary
-// gpu feature flags.
-void InitializeGpuDataManager(const CommandLine& command_line) {
- if (command_line.HasSwitch(switches::kSkipGpuDataLoading))
- return;
-
- std::string chrome_version_string = "0";
- std::string gpu_blacklist_json_string;
- if (!command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) {
- chrome::VersionInfo chrome_version_info;
- if (chrome_version_info.is_valid())
- chrome_version_string = chrome_version_info.Version();
-
- const base::StringPiece gpu_blacklist_json(
- ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_GPU_BLACKLIST, ui::SCALE_FACTOR_NONE));
- gpu_blacklist_json_string = gpu_blacklist_json.as_string();
- }
- content::GpuDataManager::GetInstance()->Initialize(
- chrome_version_string, gpu_blacklist_json_string);
-}
-
} // namespace gpu_util;
« no previous file with comments | « chrome/browser/chrome_gpu_util.h ('k') | chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698