chrome/browser/ui/views/action_box_menu.cc - Issue 11786003: Move Icons out of Extension class

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

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: Created 7 years, 10 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/views/action_box_menu.cc

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

index 61f02bb8911c9de52d639396bcc6939fe5b0ab0f..67e7176be90f6189fcc722c71c574cb3c1024826 100644

--- a/chrome/browser/ui/views/action_box_menu.cc

+++ b/chrome/browser/ui/views/action_box_menu.cc

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

#include "chrome/browser/extensions/extension_icon_image.h"

#include "chrome/browser/ui/toolbar/action_box_menu_model.h"

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

+#include "chrome/common/extensions/api/icons/icons_handler.h"

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

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

#include "ui/views/controls/button/menu_button.h"

@@ -28,7 +29,7 @@ class ExtensionImageView : public views::ImageView, public IconImage::Observer {

extension,

page_launcher_info->default_icon,

extension_misc::EXTENSION_ICON_ACTION,

- Extension::GetDefaultIcon(true),

+ extensions::IconsInfo::GetDefaultAppIcon(),

this));

SetImage(icon_->image_skia());

}