chrome/browser/ui/startup/session_crashed_prompt.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/startup/session_crashed_prompt.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/startup/session_crashed_prompt.cc

diff --git a/chrome/browser/ui/startup/session_crashed_prompt.cc b/chrome/browser/ui/startup/session_crashed_prompt.cc

index 032c77e5ec576b305e500302607e64bc4879aa22..3e9ec2354cf9b6575e742bf4d37fb2df6cb4fc3a 100644

--- a/chrome/browser/ui/startup/session_crashed_prompt.cc

+++ b/chrome/browser/ui/startup/session_crashed_prompt.cc

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

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

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

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

// static

@@ -67,9 +66,8 @@ SessionCrashedInfoBarDelegate::~SessionCrashedInfoBarDelegate() {

}

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

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

- IDR_INFOBAR_RESTORE_SESSION);

+int SessionCrashedInfoBarDelegate::GetIconID() const {

+ return IDR_INFOBAR_RESTORE_SESSION;

}

string16 SessionCrashedInfoBarDelegate::GetMessageText() const {