chrome/browser/themes/browser_theme_pack.cc - Issue 19471005: Add custom default theme support and create a managed user default theme.

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

Issue 19471005: Add custom default theme support and create a managed user default theme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments. Created 7 years, 5 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

« chrome/browser/themes/browser_theme_pack.h ('K') | « chrome/browser/themes/browser_theme_pack.h ('k') | chrome/browser/themes/custom_theme_supplier.h » ('j') | chrome/browser/themes/custom_theme_supplier.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/themes/browser_theme_pack.cc

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

index d6340cb95a5f5eed62ecb70afebabb3df73a4653..91f69bde9b8a33de50fbae642bed3335d6149533 100644

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

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

@@ -29,6 +29,7 @@

#include "ui/gfx/canvas.h"

#include "ui/gfx/codec/png_codec.h"

#include "ui/gfx/image/canvas_image_source.h"

+#include "ui/gfx/image/image.h"

#include "ui/gfx/image/image_skia.h"

#include "ui/gfx/image/image_skia_operations.h"

#include "ui/gfx/screen.h"

@@ -922,7 +923,8 @@ bool BrowserThemePack::HasCustomImage(int idr_id) const {

// private:

BrowserThemePack::BrowserThemePack()

- : header_(NULL),

+ : CustomThemeSupplier(EXTENSION),

+ header_(NULL),

tints_(NULL),

colors_(NULL),

display_properties_(NULL),