chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm - Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets

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/ui/cocoa/infobars/extension_infobar_controller.mm

Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 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/ui/cocoa/infobars/extension_infobar_controller.mm

diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

index 5d867b58c912b2bf7bc4910369bdc694c2bdd9af..ef8cb2862df4a548275cea666c6aa2aeeec87588 100644

--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

@@ -17,6 +17,7 @@

#import "chrome/browser/ui/cocoa/menu_button.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

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

+#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_icon_set.h"

#include "chrome/common/extensions/extension_resource.h"

#include "content/public/browser/web_contents.h"

@@ -73,11 +74,11 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,

const extensions::Extension* extension = delegate_->extension_host()->

extension();

ExtensionResource icon_resource =

- extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_BITTY,

+ extension->GetIconResource(extension_misc::EXTENSION_ICON_BITTY,

ExtensionIconSet::MATCH_EXACTLY);

tracker_.LoadImage(extension, icon_resource,

- gfx::Size(ExtensionIconSet::EXTENSION_ICON_BITTY,

- ExtensionIconSet::EXTENSION_ICON_BITTY),

+ gfx::Size(extension_misc::EXTENSION_ICON_BITTY,

+ extension_misc::EXTENSION_ICON_BITTY),

ImageLoadingTracker::DONT_CACHE);

}

@@ -101,7 +102,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,

SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);

- const int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;

+ const int image_size = extension_misc::EXTENSION_ICON_BITTY;

scoped_ptr<gfx::Canvas> canvas(

new gfx::Canvas(

gfx::Size(image_size + kDropArrowLeftMarginPx + drop_image->width(),