chrome/common/icon_with_badge_image_source.h - Issue 11588004: Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

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/common/icon_with_badge_image_source.h

Issue 11588004: Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years 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/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc ('K') | « chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc ('k') | chrome/common/icon_with_badge_image_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/icon_with_badge_image_source.h

diff --git a/chrome/common/icon_with_badge_image_source.h b/chrome/common/icon_with_badge_image_source.h

index f6f94d1bc3a9765d8f69dc288d1db1d618681fa6..8040e92dc34f5c9597d6bbb55c11d26d53692678 100644

--- a/chrome/common/icon_with_badge_image_source.h

+++ b/chrome/common/icon_with_badge_image_source.h

@@ -7,7 +7,7 @@

#include <string>

-#include "chrome/common/extensions/extension.h"

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

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

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

@@ -26,7 +26,7 @@ class IconWithBadgeImageSource

const std::string& text,

const SkColor& text_color,

const SkColor& background_color,

- extensions::Extension::ActionInfo::Type action_type);

+ extensions::ActionInfo::Type action_type);

virtual ~IconWithBadgeImageSource();

private:

@@ -48,7 +48,7 @@ class IconWithBadgeImageSource

SkColor background_color_;

// Type of extension action this is for.

- extensions::Extension::ActionInfo::Type action_type_;

+ extensions::ActionInfo::Type action_type_;

DISALLOW_COPY_AND_ASSIGN(IconWithBadgeImageSource);

};