Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2487)

Unified Diff: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

Issue 12634025: Inconsistent use of [x] close panel icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_173251
Patch Set: Fixed compile on linux, mac and win 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
« no previous file with comments | « chrome/browser/resources/options/options_page.css ('k') | chrome/browser/ui/cocoa/hover_close_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
index 33fee522e299c6108d9736003d2cce1a22501d05..dc2b0f9964b5b5f698214a8068677fdb30f6e175 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
@@ -8,6 +8,7 @@
#include "base/mac/bundle_locations.h"
#include "base/mac/mac_util.h"
#include "base/sys_string_conversions.h"
+#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -132,13 +133,13 @@ const float kRightEdgeOffset = 25;
}
- (void)awakeFromNib {
- [[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];
[findBarView_ setFrame:[self hiddenFindBarFrame]];
« no previous file with comments | « chrome/browser/resources/options/options_page.css ('k') | chrome/browser/ui/cocoa/hover_close_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698