Index: chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm |
diff --git a/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm b/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm |
index e3cb05ee569ce5d608c3c4f4dcf52fd675272ccb..cf08abce64a9d47dd571de6b9b8d46c2c189676d 100644 |
--- a/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm |
+++ b/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm |
@@ -17,37 +17,13 @@ const CGFloat kLeftPadding = 3; |
} // namespace |
SearchButtonDecoration::SearchButtonDecoration(LocationBarViewMac* owner) |
- : ButtonDecoration({ |
- IDR_OMNIBOX_SEARCH_BUTTON_TOP_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_TOP, |
- IDR_OMNIBOX_SEARCH_BUTTON_TOP_RIGHT, |
- IDR_OMNIBOX_SEARCH_BUTTON_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_CENTER, |
- IDR_OMNIBOX_SEARCH_BUTTON_RIGHT, |
- IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM, |
- IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM_RIGHT |
- }, IDR_OMNIBOX_SEARCH_BUTTON_LOUPE, { |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_TOP_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_TOP, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_TOP_RIGHT, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_CENTER, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_RIGHT, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_BOTTOM_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_BOTTOM, |
- IDR_OMNIBOX_SEARCH_BUTTON_HOVER_BOTTOM_RIGHT |
- }, IDR_OMNIBOX_SEARCH_BUTTON_LOUPE, { |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_TOP_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_TOP, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_TOP_RIGHT, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_CENTER, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_RIGHT, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_BOTTOM_LEFT, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_BOTTOM, |
- IDR_OMNIBOX_SEARCH_BUTTON_PRESSED_BOTTOM_RIGHT |
- }, IDR_OMNIBOX_SEARCH_BUTTON_LOUPE, kInnerPadding), |
+ : ButtonDecoration(IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON), |
+ IDR_OMNIBOX_SEARCH_BUTTON_LOUPE, |
+ IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON_HOVER), |
+ IDR_OMNIBOX_SEARCH_BUTTON_LOUPE, |
+ IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON_PRESSED), |
+ IDR_OMNIBOX_SEARCH_BUTTON_LOUPE, |
+ kInnerPadding), |
owner_(owner) { |
DCHECK(owner_); |
} |