Replace IDR_WEB_UI_CLOSE* with IDR_CLOSE_DIALOG*, cleanup, etc.

chrome/browser/ui/chrome_style.cc

Index: chrome/browser/ui/chrome_style.cc
diff --git a/chrome/browser/ui/chrome_style.cc b/chrome/browser/ui/chrome_style.cc
index c4bdf72a7840bbda5dadc4baaea0d217e3c99a61..ef8ebbc1a8222e07fa1cad096bb7331ddd8ad838 100644
--- a/chrome/browser/ui/chrome_style.cc
+++ b/chrome/browser/ui/chrome_style.cc
@@ -5,18 +5,17 @@
 #include "chrome/browser/ui/chrome_style.h"
 
 #include "chrome/browser/themes/theme_service.h"
-#include "grit/theme_resources.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 
 namespace chrome_style {
 
 int GetCloseButtonSize() {
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  const SkBitmap* bitmap =
-      bundle.GetNativeImageNamed(IDR_WEB_UI_CLOSE).ToSkBitmap();
-  DCHECK_EQ(bitmap->width(), bitmap->height());
-  return bitmap->width();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  const SkBitmap* image = rb.GetNativeImageNamed(IDR_CLOSE_DIALOG).ToSkBitmap();
+  DCHECK_EQ(image->width(), image->height());
+  return image->width();
 }
 
 SkColor GetBackgroundColor() {