chromecast/browser/cast_browser_main_parts.cc - Issue 1132663004: Chromecast: adds Android implementation of CastSysInfo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/browser/cast_browser_main_parts.cc

Issue 1132663004: Chromecast: adds Android implementation of CastSysInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 7 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 | « chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java ('k') | chromecast/chromecast.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 cb9a128435696017e3e404cb0df6d64b0c036359..1c4c7fe778f16d3482ca8830ee2c73ee2063c192 100644

--- a/chromecast/browser/cast_browser_main_parts.cc

+++ b/chromecast/browser/cast_browser_main_parts.cc

@@ -274,6 +274,7 @@ 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.

@@ -281,6 +282,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {

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());