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

Unified Diff: chromecast/browser/cast_browser_main_parts.cc

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Execute todo, send IPC directly from gpu_benchmarking_extension.cc and fixes variable names. Created 4 years, 10 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
« no previous file with comments | « chrome/browser/gpu/gl_string_manager.cc ('k') | content/browser/devtools/protocol/system_info_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/cast_browser_main_parts.cc
diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
index 8c29892c3514229b03d31414f50b81598ec160ef..98d4955d8641eded082197f93381149ddb896795 100644
--- a/chromecast/browser/cast_browser_main_parts.cc
+++ b/chromecast/browser/cast_browser_main_parts.cc
@@ -321,6 +321,14 @@ int CastBrowserMainParts::PreCreateThreads() {
// AudioManager is created immediately after threads are created, requiring
// AudioManagerFactory to be set beforehand.
::media::AudioManager::SetFactory(new media::CastAudioManagerFactory());
+
+ // Set GL strings so GPU config code can make correct feature blacklisting/
+ // whitelisting decisions.
+ // Note: SetGLStrings can be called before GpuDataManager::Initialize.
+ scoped_ptr<CastSysInfo> sys_info = CreateSysInfo();
+ content::GpuDataManager::GetInstance()->SetGLStrings(
+ sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
+ sys_info->GetGlVersion());
#endif
#if defined(USE_AURA)
@@ -339,16 +347,6 @@ int CastBrowserMainParts::PreCreateThreads() {
}
void CastBrowserMainParts::PreMainMessageLoopRun() {
-#if !defined(OS_ANDROID)
- // Set GL strings so GPU config code can make correct feature blacklisting/
- // whitelisting decisions.
- // Note: SetGLStrings MUST be called after GpuDataManager::Initialize.
- scoped_ptr<CastSysInfo> sys_info = CreateSysInfo();
- content::GpuDataManager::GetInstance()->SetGLStrings(
- sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
- sys_info->GetGlVersion());
-#endif // !defined(OS_ANDROID)
-
scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple());
metrics::RegisterPrefs(pref_registry.get());
cast_browser_process_->SetPrefService(
« no previous file with comments | « chrome/browser/gpu/gl_string_manager.cc ('k') | content/browser/devtools/protocol/system_info_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698