views: Rename IDR_INFOBARBUTTON_<POSITION>_<STATE> to IDR_INFOBARBUTTON_<STATE>_<POSITION>.

chrome/browser/ui/views/infobars/infobar_button_border.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/infobars/infobar_button_border.h"
 
 #include "chrome/browser/defaults.h"
 #include "grit/theme_resources.h"
 #include "ui/views/controls/button/border_images.h"
 
 #define BORDER_IMAGES(x, y) \

[msw, 2012/10/30 22:47:06]

Remove this and expose/use BORDER_IMAGES(IDR_INFOBARBUTTON_<STATE>) from
ui/views/controls/button/border_images.h
(I'd prefer to keep that macro to 3 lines with visual ordering)

[tfarina, 2012/10/30 22:53:56]

Done.

-  x ## _TOP_LEFT_ ## y,    x ## _TOP_ ## y,    x ## _TOP_RIGHT_ ## y, \
-  x ## _LEFT_ ## y,        x ## _CENTER_ ## y, x ## _RIGHT_ ## y, \
-  x ## _BOTTOM_LEFT_ ## y, x ## _BOTTOM_ ## y, x ## _BOTTOM_RIGHT_ ## y,
+  x ## _ ## y ## _TOP_LEFT, \
+  x ## _ ## y ## _TOP, \
+  x ## _ ## y ## _TOP_RIGHT, \
+  x ## _ ## y ## _LEFT, \
+  x ## _ ## y ## _CENTER, \
+  x ## _ ## y ## _RIGHT, \
+  x ## _ ## y ## _BOTTOM_LEFT, \
+  x ## _ ## y ## _BOTTOM, \
+  x ## _ ## y ## _BOTTOM_RIGHT,
 
 namespace {
 
-const int kNormalImageSet[] = { BORDER_IMAGES(IDR_INFOBARBUTTON, N) };
-const int kHotImageSet[] = { BORDER_IMAGES(IDR_INFOBARBUTTON, H) };
-const int kPushedImageSet[] = { BORDER_IMAGES(IDR_INFOBARBUTTON, P) };
+const int kNormalImageSet[] = { BORDER_IMAGES(IDR_INFOBARBUTTON, NORMAL) };
+const int kHotImageSet[] = { BORDER_IMAGES(IDR_INFOBARBUTTON, HOVER) };
+const int kPushedImageSet[] = { BORDER_IMAGES(IDR_INFOBARBUTTON, PRESSED) };
 
 }  // namespace
 
 InfoBarButtonBorder::InfoBarButtonBorder() {
   set_vertical_padding(browser_defaults::kInfoBarBorderPaddingVertical);
   set_normal_set(views::BorderImages(kNormalImageSet));
   set_hot_set(views::BorderImages(kHotImageSet));
   set_pushed_set(views::BorderImages(kPushedImageSet));
 }
 
 InfoBarButtonBorder::~InfoBarButtonBorder() {
 }