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

5 files changed, 114 insertions, 114 deletions

diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc
index 4e0b5f7..bd7282b 100644
--- a/chrome/views/controls/button/text_button.cc
+++ b/chrome/views/controls/button/text_button.cc
@@ -41,25 +41,25 @@ static const int kHoverAnimationDurationMs = 170;
 TextButtonBorder::TextButtonBorder() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
-  hot_set_.top_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_LEFT_H);
-  hot_set_.top = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_H);
-  hot_set_.top_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_H);
-  hot_set_.left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_LEFT_H);
-  hot_set_.center = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_CENTER_H);
-  hot_set_.right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_RIGHT_H);
-  hot_set_.bottom_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_H);
-  hot_set_.bottom = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_H);
-  hot_set_.bottom_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_H);
-
-  pushed_set_.top_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_LEFT_P);
-  pushed_set_.top = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_P);
-  pushed_set_.top_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_P);
-  pushed_set_.left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_LEFT_P);
-  pushed_set_.center = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_CENTER_P);
-  pushed_set_.right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_RIGHT_P);
-  pushed_set_.bottom_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_P);
-  pushed_set_.bottom = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_P);
-  pushed_set_.bottom_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_P);
+  hot_set_.top_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_LEFT_H);
+  hot_set_.top = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_H);
+  hot_set_.top_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_RIGHT_H);
+  hot_set_.left = rb.GetBitmapNamed(IDR_TEXTBUTTON_LEFT_H);
+  hot_set_.center = rb.GetBitmapNamed(IDR_TEXTBUTTON_CENTER_H);
+  hot_set_.right = rb.GetBitmapNamed(IDR_TEXTBUTTON_RIGHT_H);
+  hot_set_.bottom_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_H);
+  hot_set_.bottom = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_H);
+  hot_set_.bottom_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_H);
+
+  pushed_set_.top_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_LEFT_P);
+  pushed_set_.top = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_P);
+  pushed_set_.top_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_RIGHT_P);
+  pushed_set_.left = rb.GetBitmapNamed(IDR_TEXTBUTTON_LEFT_P);
+  pushed_set_.center = rb.GetBitmapNamed(IDR_TEXTBUTTON_CENTER_P);
+  pushed_set_.right = rb.GetBitmapNamed(IDR_TEXTBUTTON_RIGHT_P);
+  pushed_set_.bottom_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_P);
+  pushed_set_.bottom = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_P);
+  pushed_set_.bottom_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_P);
 }
 
 TextButtonBorder::~TextButtonBorder() {
diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc
index e8a8144..58d1ac8 100644
--- a/chrome/views/controls/throbber.cc
+++ b/chrome/views/controls/throbber.cc
@@ -23,7 +23,7 @@ Throbber::Throbber(int frame_time_ms,
       frames_(NULL),
       frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)) {
   ResourceBundle &rb = ResourceBundle::GetSharedInstance();
-  frames_ = rb.GetBitmapNamed(IDR_VIEWS_THROBBER);
+  frames_ = rb.GetBitmapNamed(IDR_THROBBER);
   DCHECK(frames_->width() > 0 && frames_->height() > 0);
   DCHECK(frames_->width() % frames_->height() == 0);
   frame_count_ = frames_->width() / frames_->height();
@@ -160,7 +160,7 @@ void CheckmarkThrobber::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    checkmark_ = rb.GetBitmapNamed(IDR_VIEWS_INPUT_GOOD);
+    checkmark_ = rb.GetBitmapNamed(IDR_INPUT_GOOD);
     initialized = true;
   }
 }
diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc
index cb40b8f..0da388b 100644
--- a/chrome/views/controls/tree/tree_view.cc
+++ b/chrome/views/controls/tree/tree_view.cc
@@ -620,10 +620,10 @@ HIMAGELIST TreeView::CreateImageList() {
   // Creates the default image list used for trees.
   SkBitmap* closed_icon =
       ResourceBundle::GetSharedInstance().GetBitmapNamed(
-          (rtl ? IDR_VIEWS_FOLDER_CLOSED_RTL : IDR_VIEWS_FOLDER_CLOSED));
+          (rtl ? IDR_FOLDER_CLOSED_RTL : IDR_FOLDER_CLOSED));
   SkBitmap* opened_icon =
       ResourceBundle::GetSharedInstance().GetBitmapNamed(
-          (rtl ? IDR_VIEWS_FOLDER_OPEN_RTL : IDR_VIEWS_FOLDER_OPEN));
+          (rtl ? IDR_FOLDER_OPEN_RTL : IDR_FOLDER_OPEN));
   int width = closed_icon->width();
   int height = closed_icon->height();
   DCHECK(opened_icon->width() == width && opened_icon->height() == height);
diff --git a/chrome/views/resources/views_resources.grd b/chrome/views/resources/views_resources.grd
index 483d725..3ae884e 100644
--- a/chrome/views/resources/views_resources.grd
+++ b/chrome/views/resources/views_resources.grd
@@ -10,85 +10,85 @@
   <release seq="1">
     <includes>
       <!-- Window frame controls -->
-      <include name="IDR_VIEWS_CLOSE" file="close.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CLOSE_H" file="close_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CLOSE_P" file="close_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CLOSE_SA" file="close_sa.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_MAXIMIZE" file="maximize.png" type="BINDATA" />
-      <include name="IDR_VIEWS_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_MINIMIZE" file="minimize.png" type="BINDATA" />
-      <include name="IDR_VIEWS_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_RESTORE" file="restore.png" type="BINDATA" />
-      <include name="IDR_VIEWS_RESTORE_H" file="restore_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_RESTORE_P" file="restore_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE" file="close.png" type="BINDATA" />
+      <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
+      <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" />
+      <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
+      <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
+      <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" />
+      <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
+      <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
+      <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" />
+      <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
+      <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
+      <include name="IDR_RESTORE" file="restore.png" type="BINDATA" />
+      <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" />
+      <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" />
 
       <!-- Active window frame parts -->
-      <include name="IDR_VIEWS_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" />
+      <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" />
 
       <!-- Inactive window frame parts -->
-      <include name="IDR_VIEWS_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" />
+      <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" />
 
       <!-- Client edge parts -->
-      <include name="IDR_VIEWS_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" />
-      <include name="IDR_VIEWS_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" />
-      <include name="IDR_VIEWS_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" />
-      <include name="IDR_VIEWS_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" />
+      <include name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" />
+      <include name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" />
+      <include name="IDR_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" />
 
       <!-- Throbber -->
-      <include name="IDR_VIEWS_THROBBER" file="throbber.png" type="BINDATA" />
+      <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" />
       
       <!-- Input types -->
-      <include name="IDR_VIEWS_INPUT_GOOD" file="input_good.png" type="BINDATA" />
-      <include name="IDR_VIEWS_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
-      <include name="IDR_VIEWS_INPUT_UNKNOWN" file="input_unknown.png" type="BINDATA" />
+      <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" />
+      <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
+      <include name="IDR_INPUT_UNKNOWN" file="input_unknown.png" type="BINDATA" />
 
       <!-- Tree Folder -->
-      <include name="IDR_VIEWS_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" />
-      <include name="IDR_VIEWS_FOLDER_OPEN" file="folder_open.png" type="BINDATA" />
-      <include name="IDR_VIEWS_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" />
-      <include name="IDR_VIEWS_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" />
 
       <!-- Text button -->
-      <include name="IDR_VIEWS_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" />
-      <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc
index 47cdb76..da15a44 100644
--- a/chrome/views/window/custom_frame_view.cc
+++ b/chrome/views/window/custom_frame_view.cc
@@ -79,19 +79,19 @@ class ActiveWindowResources : public WindowResources {
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
         0,
-        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_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT,
-            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_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_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
+            IDR_CONTENT_RIGHT_SIDE, IDR_CONTENT_BOTTOM_RIGHT_CORNER,
+            IDR_CONTENT_BOTTOM_CENTER, IDR_CONTENT_BOTTOM_LEFT_CORNER,
+            IDR_CONTENT_LEFT_SIDE,
         0
       };
 
@@ -129,19 +129,19 @@ class InactiveWindowResources : public WindowResources {
     if (!initialized) {
       static const int kFramePartBitmapIds[] = {
         0,
-        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_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT,
-            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_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_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
+            IDR_CONTENT_RIGHT_SIDE, IDR_CONTENT_BOTTOM_RIGHT_CORNER,
+            IDR_CONTENT_BOTTOM_CENTER, IDR_CONTENT_BOTTOM_LEFT_CORNER,
+            IDR_CONTENT_LEFT_SIDE,
         0
       };