chrome/browser/ui/cocoa/infobars/infobar_controller.mm - Issue 12703039: Inconsistent use of [x] close panel icon. Code changes.

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/infobar_controller.mm

Issue 12703039: Inconsistent use of [x] close panel icon. Code changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added recently added local NTP file. Created 7 years, 9 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

Index: chrome/browser/ui/cocoa/infobars/infobar_controller.mm

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

index edee20f96046b31e1d1132075f3b5636cdc75ed0..081fb11c115f8011db9e6e3e6f9b0c98c8814c86 100644

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

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

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

#import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"

#import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

+#include "grit/theme_resources.h"

#include "grit/ui_resources.h"

#include "ui/gfx/image/image.h"

@@ -60,13 +61,13 @@ const float kAnimateCloseDuration = 0.12;

- (void)awakeFromNib {

DCHECK(delegate_);

- [[closeButton_ cell] setImageID:IDR_CLOSE_BAR

+ [[closeButton_ cell] setImageID:IDR_CLOSE_1

forButtonState:image_button_cell::kDefaultState];

- [[closeButton_ cell] setImageID:IDR_CLOSE_BAR_H

+ [[closeButton_ cell] setImageID:IDR_CLOSE_1_H

forButtonState:image_button_cell::kHoverState];

- [[closeButton_ cell] setImageID:IDR_CLOSE_BAR_P

+ [[closeButton_ cell] setImageID:IDR_CLOSE_1_P

forButtonState:image_button_cell::kPressedState];

- [[closeButton_ cell] setImageID:IDR_CLOSE_BAR

+ [[closeButton_ cell] setImageID:IDR_CLOSE_1

forButtonState:image_button_cell::kDisabledState];

if (delegate_->GetIcon()) {

« no previous file with comments | « chrome/browser/ui/cocoa/hover_close_button.mm ('k') | chrome/browser/ui/gtk/confirm_bubble_gtk.cc » ('j') | no next file with comments »