chrome/browser/ui/views/infobars/extension_infobar.cc - 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/views/infobars/extension_infobar.cc

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc ('k') | chrome/browser/ui/webui/extensions/extension_activity_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/infobars/extension_infobar.cc

diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc

index e56fbbc714a599e4e2926112ad350bb6342ae0d4..9a783d7a9f7a62ec830946509335bd63ef3938f7 100644

--- a/chrome/browser/ui/views/infobars/extension_infobar.cc

+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/platform_util.h"

#include "chrome/browser/ui/views/frame/browser_view.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 "grit/theme_resources.h"

@@ -47,7 +48,7 @@ class MenuImageSource: public gfx::CanvasImageSource {

// Overridden from gfx::CanvasImageSource

void Draw(gfx::Canvas* canvas) OVERRIDE {

- int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;

+ int image_size = extension_misc::EXTENSION_ICON_BITTY;

canvas->DrawImageInt(icon_, 0, 0, icon_.width(), icon_.height(), 0, 0,

image_size, image_size, false);

canvas->DrawImageInt(drop_image_, image_size + kDropArrowLeftMargin,

@@ -56,7 +57,7 @@ class MenuImageSource: public gfx::CanvasImageSource {

private:

gfx::Size ComputeSize(const gfx::ImageSkia& drop_image) const {

- int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;

+ int image_size = extension_misc::EXTENSION_ICON_BITTY;

return gfx::Size(image_size + kDropArrowLeftMargin + drop_image.width(),

image_size);

}

@@ -129,7 +130,8 @@ void ExtensionInfoBar::ViewHierarchyChanged(bool is_add,

// which assumes that particular children (e.g. the close button) have already

// been added.

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

- ExtensionIconSet::Icons image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;

+ extension_misc::ExtensionIcons image_size =

+ extension_misc::EXTENSION_ICON_BITTY;

ExtensionResource icon_resource = extension->GetIconResource(

image_size, ExtensionIconSet::MATCH_EXACTLY);

tracker_.LoadImage(extension, icon_resource,