chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc - Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID()

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/extensions/app_metro_infobar_delegate_win.cc

Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Nit fixes redux Created 7 years, 7 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/extensions/app_metro_infobar_delegate_win.cc

diff --git a/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc b/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc

index 11dbf1a1758e973fab8b70ddb73f24178cb16777..ea5a19ec4cb9a2eb896db39274e9be7e5f4e549e 100644

--- a/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc

+++ b/chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc

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

#include "grit/generated_resources.h"

#include "grit/google_chrome_strings.h"

#include "ui/base/l10n/l10n_util.h"

-#include "ui/base/resource/resource_bundle.h"

#include "win8/util/win8_util.h"

namespace chrome {

@@ -69,9 +68,8 @@ AppMetroInfoBarDelegateWin::AppMetroInfoBarDelegateWin(

AppMetroInfoBarDelegateWin::~AppMetroInfoBarDelegateWin() {}

-gfx::Image* AppMetroInfoBarDelegateWin::GetIcon() const {

- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(

- chrome::GetAppListIconResourceId());

+int AppMetroInfoBarDelegateWin::GetIconID() const {

+ return chrome::GetAppListIconResourceId();

}

string16 AppMetroInfoBarDelegateWin::GetMessageText() const {