chrome/browser/themes/theme_service.cc - Issue 1560553002: Framelet Prototype 2016

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: chrome/browser/themes/theme_service.cc

Issue 1560553002: Framelet Prototype 2016 Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased + Applied Brett's Windows + Fixed security issue Created 4 years, 11 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:

Index: chrome/browser/themes/theme_service.cc

diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc

index 5a18c2e8a5438f4c1443b400b63d56acf9b51ba0..9d8392f007ed989d9ba56f1fd549324582f9789a 100644

--- a/chrome/browser/themes/theme_service.cc

+++ b/chrome/browser/themes/theme_service.cc

@@ -588,9 +588,12 @@ base::RefCountedMemory* ThemeService::GetRawData(

int id,

ui::ScaleFactor scale_factor) const {

// Check to see whether we should substitute some images.

- int ntp_alternate = GetDisplayProperty(ThemeProperties::NTP_LOGO_ALTERNATE);

- if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)

- id = IDR_PRODUCT_LOGO_WHITE;

+ // TODO(fsamuel): Figure out why removing these resources on Android fixes

+ // loading.

+ // int ntp_alternate =

+ // GetDisplayProperty(ThemeProperties::NTP_LOGO_ALTERNATE);

+ // if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)

+ // id = IDR_PRODUCT_LOGO_WHITE;

base::RefCountedMemory* data = nullptr;

if (theme_supplier_)

« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »