Reverting 15182.

Review URL: http://codereview.chromium.org/101024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15186 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 56 insertions, 56 deletions

diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index af54e9e..dfa5a32 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -67,7 +67,7 @@ enum {
 
 static const int kXPFramePartIDs[] = {
     0,
-    IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
+    IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
     IDR_CONSTRAINED_BOTTOM_CENTER, IDR_CONSTRAINED_BOTTOM_LEFT_CORNER,
     IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER, IDR_CONSTRAINED_LEFT_SIDE,
     IDR_CONSTRAINED_RIGHT_SIDE, IDR_CONSTRAINED_TOP_CENTER,
@@ -75,7 +75,7 @@ static const int kXPFramePartIDs[] = {
     0 };
 static const int kVistaFramePartIDs[] = {
     0,
-    IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
+    IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
     IDR_CONSTRAINED_BOTTOM_CENTER_V, IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V,
     IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V, IDR_CONSTRAINED_LEFT_SIDE_V,
     IDR_CONSTRAINED_RIGHT_SIDE_V, IDR_CONSTRAINED_TOP_CENTER_V,
@@ -83,7 +83,7 @@ static const int kVistaFramePartIDs[] = {
     0 };
 static const int kOTRFramePartIDs[] = {
     0,
-    IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
+    IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
     IDR_WINDOW_BOTTOM_CENTER_OTR, IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR,
     IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_WINDOW_LEFT_SIDE_OTR,
     IDR_WINDOW_RIGHT_SIDE_OTR, IDR_WINDOW_TOP_CENTER_OTR,
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index 23c6231..d2dda5f 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -348,12 +348,12 @@ void EditKeywordController::UpdateImageView(ImageView* image_view,
     image_view->SetTooltipText(std::wstring());
     image_view->SetImage(
         ResourceBundle::GetSharedInstance().GetBitmapNamed(
-            IDR_VIEWS_INPUT_GOOD));
+            IDR_INPUT_GOOD));
   } else {
     image_view->SetTooltipText(l10n_util::GetString(invalid_message_id));
     image_view->SetImage(
         ResourceBundle::GetSharedInstance().GetBitmapNamed(
-            IDR_VIEWS_INPUT_ALERT));
+            IDR_INPUT_ALERT));
   }
 }
 
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index b3be856..4d87db7 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -45,9 +45,9 @@ class GlassBrowserWindowResources {
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE,
-            IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER,
-            IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE,
+            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
+            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
+            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 0e20784..957cc1d 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -85,20 +85,20 @@ class ActiveWindowResources : public views::WindowResources {
     static bool initialized = false;
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
-        IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P,
-        IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
-        IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P,
-        IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P,
-        IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P,
-        IDR_VIEWS_WINDOW_BOTTOM_CENTER, IDR_VIEWS_WINDOW_BOTTOM_LEFT_CORNER,
-            IDR_VIEWS_WINDOW_BOTTOM_RIGHT_CORNER, IDR_VIEWS_WINDOW_LEFT_SIDE,
-            IDR_VIEWS_WINDOW_RIGHT_SIDE, IDR_VIEWS_WINDOW_TOP_CENTER,
-            IDR_VIEWS_WINDOW_TOP_LEFT_CORNER, IDR_VIEWS_WINDOW_TOP_RIGHT_CORNER,
+        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
+        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
+        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
+        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
+        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
+        IDR_WINDOW_BOTTOM_CENTER, IDR_WINDOW_BOTTOM_LEFT_CORNER,
+            IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_LEFT_SIDE,
+            IDR_WINDOW_RIGHT_SIDE, IDR_WINDOW_TOP_CENTER,
+            IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_RIGHT_CORNER,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE,
-            IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER,
-            IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE,
-        IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT,
+            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
+            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
+            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
+        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -130,20 +130,20 @@ class InactiveWindowResources : public views::WindowResources {
     static bool initialized = false;
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
-        IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P,
-        IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
-        IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P,
-        IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P,
-        IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P,
-        IDR_VIEWS_DEWINDOW_BOTTOM_CENTER, IDR_VIEWS_DEWINDOW_BOTTOM_LEFT_CORNER,
-            IDR_VIEWS_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_VIEWS_DEWINDOW_LEFT_SIDE,
-            IDR_VIEWS_DEWINDOW_RIGHT_SIDE, IDR_VIEWS_DEWINDOW_TOP_CENTER,
-            IDR_VIEWS_DEWINDOW_TOP_LEFT_CORNER, IDR_VIEWS_DEWINDOW_TOP_RIGHT_CORNER,
+        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
+        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
+        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
+        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
+        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
+        IDR_DEWINDOW_BOTTOM_CENTER, IDR_DEWINDOW_BOTTOM_LEFT_CORNER,
+            IDR_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_DEWINDOW_LEFT_SIDE,
+            IDR_DEWINDOW_RIGHT_SIDE, IDR_DEWINDOW_TOP_CENTER,
+            IDR_DEWINDOW_TOP_LEFT_CORNER, IDR_DEWINDOW_TOP_RIGHT_CORNER,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE,
-            IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER,
-            IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE,
-        IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT,
+            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
+            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
+            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
+        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -175,20 +175,20 @@ class OTRActiveWindowResources : public views::WindowResources {
     static bool initialized = false;
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
-        IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P,
-        IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
-        IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P,
-        IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P,
-        IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P,
+        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
+        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
+        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
+        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
+        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
         IDR_WINDOW_BOTTOM_CENTER_OTR, IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR,
             IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_WINDOW_LEFT_SIDE_OTR,
             IDR_WINDOW_RIGHT_SIDE_OTR, IDR_WINDOW_TOP_CENTER_OTR,
             IDR_WINDOW_TOP_LEFT_CORNER_OTR, IDR_WINDOW_TOP_RIGHT_CORNER_OTR,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE,
-            IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER,
-            IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE,
-        IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT,
+            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
+            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
+            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
+        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -220,21 +220,21 @@ class OTRInactiveWindowResources : public views::WindowResources {
     static bool initialized = false;
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
-        IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P,
-        IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P,
-        IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P,
-        IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P,
-        IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P,
+        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
+        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
+        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
+        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
+        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
         IDR_DEWINDOW_BOTTOM_CENTER_OTR, IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR,
             IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_DEWINDOW_LEFT_SIDE_OTR,
             IDR_DEWINDOW_RIGHT_SIDE_OTR, IDR_DEWINDOW_TOP_CENTER_OTR,
             IDR_DEWINDOW_TOP_LEFT_CORNER_OTR,
             IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE,
-            IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER,
-            IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE,
-        IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT,
+            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
+            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
+            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
+        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index cc11a2a..7a07810 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -160,8 +160,8 @@ void FileDisplayArea::InitClass() {
     bool ui_is_rtl = l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT;
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_folder_icon_ = *rb.GetBitmapNamed(ui_is_rtl ?
-                                              IDR_VIEWS_FOLDER_CLOSED_RTL :
-                                              IDR_VIEWS_FOLDER_CLOSED);
+                                              IDR_FOLDER_CLOSED_RTL :
+                                              IDR_FOLDER_CLOSED);
     initialized = true;
   }
 }
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index 922ea1c..cbc3b77 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -39,7 +39,7 @@ void TabIconView::InitializeIfNeeded() {
         IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16));
     DestroyIcon(app_icon);
 
-    g_throbber_frames = rb.GetBitmapNamed(IDR_VIEWS_THROBBER);
+    g_throbber_frames = rb.GetBitmapNamed(IDR_THROBBER);
     g_throbber_frames_light = rb.GetBitmapNamed(IDR_THROBBER_LIGHT);
     g_throbber_frame_count = g_throbber_frames->width() /
         g_throbber_frames->height();
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 3c4a5c3..d8d74b2 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -88,7 +88,7 @@ void InitResources() {
 
     // The loading animation image is a strip of states. Each state must be
     // square, so the height must divide the width evenly.
-    loading_animation_frames = rb.GetBitmapNamed(IDR_VIEWS_THROBBER);
+    loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
     DCHECK(loading_animation_frames);
     DCHECK(loading_animation_frames->width() %
            loading_animation_frames->height() == 0);