chrome/browser/extensions/extension_action.h - Issue 1363463002: [Extensions Toolbar] Add a finch config for the redesign

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/extensions/extension_action.h

Issue 1363463002: [Extensions Toolbar] Add a finch config for the redesign (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Finnur's Created 5 years, 3 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/extensions/api/declarative_content/declarative_content_apitest.cc ('k') | chrome/browser/extensions/extension_action.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action.h

diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h

index 9e73dbc9e0a2564c82742906a0d3c48a0355aff8..ff2948164bf894ae1ca50566a7b58448539cef90 100644

--- a/chrome/browser/extensions/extension_action.h

+++ b/chrome/browser/extensions/extension_action.h

@@ -13,6 +13,7 @@

#include "base/stl_util.h"

#include "chrome/common/extensions/api/extension_action/action_info.h"

#include "third_party/skia/include/core/SkColor.h"

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

class GURL;

@@ -287,6 +288,11 @@ class ExtensionAction {

// Lazily initialized via LoadDefaultIconImage().

scoped_ptr<extensions::IconImage> default_icon_image_;

+ // The lazily-initialized image for a placeholder icon, in the event that the

+ // extension doesn't have its own icon. (Mutable to allow lazy init in

+ // GetDefaultIconImage().)

+ mutable gfx::Image placeholder_icon_image_;

// The id for the ExtensionAction, for example: "RssPageAction". This is

// needed for compat with an older version of the page actions API.

std::string id_;