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; |
@@ -129,19 +127,11 @@ |
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(); |
+ 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); |
+ content::GpuDataManager::GetInstance()->Initialize(chrome_version_string); |
} |
} // namespace gpu_util; |