chrome/browser/icon_loader_chromeos.cc - Issue 23205006: Define proprietary_codecs=1 when branding==Chrome.

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/icon_loader_chromeos.cc

Issue 23205006: Define proprietary_codecs=1 when branding==Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase onto lkgr Created 7 years, 4 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/icon_loader_chromeos.cc

diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc

index 1329845bd95f62944e57a32358af8e2ab488e2c0..c55d7c8731c64ead509ddde204f783e956ab4d57 100644

--- a/chrome/browser/icon_loader_chromeos.cc

+++ b/chrome/browser/icon_loader_chromeos.cc

@@ -91,7 +91,7 @@ IconMapper::IconMapper() {

// 'video': /\.(mov|mp4|m4v|mpe?g4?|ogm|ogv|ogx|webm)$/i

const ExtensionIconMap::value_type kExtensionIdrBySizeData[] = {

-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)

+#if defined(USE_PROPRIETARY_CODECS)

std::make_pair(".m4a", kAudioIdrs),

std::make_pair(".mp3", kAudioIdrs),

std::make_pair(".pdf", kPdfIdrs),

« no previous file with comments | « build/common.gypi ('k') | content/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »