Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / location_bar / autocomplete_text_field_cell.mm

diff --git a/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm b/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
index 7ebd1a0..180073f 100644 (file)
--- a/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
+++ b/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
@@ -37,29 +37,11 @@ const CGFloat kDecorationHorizontalPad = 3.0;
 
 NSString* const kButtonDecorationKey = @"ButtonDecoration";
 
-const ui::NinePartImageIds kPopupBorderImageIds = {
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP_LEFT,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP_RIGHT,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_LEFT,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_CENTER,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_RIGHT,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_BOTTOM_LEFT,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_BOTTOM,
-  IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_BOTTOM_RIGHT
-};
-
-const ui::NinePartImageIds kNormalBorderImageIds = {
-  IDR_OMNIBOX_BORDER_AND_SHADOW_TOP_LEFT,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_TOP,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_TOP_RIGHT,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_LEFT,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_CENTER,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_RIGHT,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_BOTTOM_LEFT,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_BOTTOM,
-  IDR_OMNIBOX_BORDER_AND_SHADOW_BOTTOM_RIGHT
-};
+const ui::NinePartImageIds kPopupBorderImageIds =
+    IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW);
+
+const ui::NinePartImageIds kNormalBorderImageIds =
+    IMAGE_GRID(IDR_OMNIBOX_BORDER_AND_SHADOW);
 
 // How long to wait for mouse-up on the location icon before assuming
 // that the user wants to drag.