Bring theme_frame back into chrome/ and change theme_frame to frame in app/

BUG=none
TEST=none

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

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

7 files changed, 19 insertions, 17 deletions

diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index 2f9f577..a44c58e 100644
--- a/app/resources/app_resources.grd
+++ b/app/resources/app_resources.grd
@@ -29,9 +29,9 @@
       <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
       <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
 
-      <!-- Frame Theme Images -->
-      <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
-      <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
+      <!-- Frame Images -->
+      <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" />
+      <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" />
 
       <!-- Frame Edge Images -->
       <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
diff --git a/app/resources/theme_frame_default.png b/app/resources/frame_default.png
index 3f4f7e9..3f4f7e9 100644
--- a/app/resources/theme_frame_default.png
+++ b/app/resources/frame_default.png
diff --git a/app/resources/theme_frame_default_inactive.png b/app/resources/frame_default_inactive.png
index a1eff41..a1eff41 100644
--- a/app/resources/theme_frame_default_inactive.png
+++ b/app/resources/frame_default_inactive.png
diff --git a/chrome/app/theme/theme_frame_default.png b/chrome/app/theme/theme_frame_default.png
new file mode 100644
index 0000000..3f4f7e9
--- /dev/null
+++ b/chrome/app/theme/theme_frame_default.png
diff --git a/chrome/app/theme/theme_frame_default_inactive.png b/chrome/app/theme/theme_frame_default_inactive.png
new file mode 100644
index 0000000..a1eff41
--- /dev/null
+++ b/chrome/app/theme/theme_frame_default_inactive.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 125ffff..626a045 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -248,6 +248,8 @@
       <include name="IDR_O2_STAR_SELECTED_DARK" file="o2_star_selected_dark.png" type="BINDATA" />
       <include name="IDR_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" />
 
+      <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
+      <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
       <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" />
       <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive.png" type="BINDATA" />
       <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" />
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index e8fdb0f..b5ef3ab9 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -299,14 +299,14 @@ void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   // Window frame mode.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
-  SkBitmap* theme_frame;
+  SkBitmap* frame_image;
   SkColor frame_color;
 
   if (frame_->IsActive()) {
-    theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME);
+    frame_image = rb.GetBitmapNamed(IDR_FRAME);
     frame_color = ResourceBundle::frame_color;
   } else {
-    theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
+    frame_image = rb.GetBitmapNamed(IDR_FRAME_INACTIVE);
     frame_color = ResourceBundle::frame_color_inactive;
   }
 
@@ -324,14 +324,14 @@ void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
 
   // Fill with the frame color first so we have a constant background for
   // areas not covered by the theme image.
-  canvas->FillRectInt(frame_color, 0, 0, width(), theme_frame->height());
+  canvas->FillRectInt(frame_color, 0, 0, width(), frame_image->height());
   // Now fill down the sides
   canvas->FillRectInt(frame_color,
-      0, theme_frame->height(),
-      left_edge->width(), height() - theme_frame->height());
+      0, frame_image->height(),
+      left_edge->width(), height() - frame_image->height());
   canvas->FillRectInt(frame_color,
-      width() - right_edge->width(), theme_frame->height(),
-      right_edge->width(), height() - theme_frame->height());
+      width() - right_edge->width(), frame_image->height(),
+      right_edge->width(), height() - frame_image->height());
   // Now fill the bottom area.
   canvas->FillRectInt(frame_color,
       left_edge->width(), height() - bottom_edge->height(),
@@ -339,7 +339,7 @@ void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
       bottom_edge->height());
 
   // Draw the theme frame.
-  canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
+  canvas->TileImageInt(*frame_image, 0, 0, width(), frame_image->height());
 
   // Top.
   canvas->DrawBitmapInt(*top_left_corner, 0, 0);
@@ -376,12 +376,12 @@ void CustomFrameView::PaintMaximizedFrameBorder(
     gfx::Canvas* canvas) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
-  SkBitmap* theme_frame = frame_->IsActive() ?
-        rb.GetBitmapNamed(IDR_THEME_FRAME) :
-        rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
+  SkBitmap* frame_image = frame_->IsActive() ?
+        rb.GetBitmapNamed(IDR_FRAME) :
+        rb.GetBitmapNamed(IDR_FRAME_INACTIVE);
 
-  canvas->TileImageInt(*theme_frame, 0, FrameBorderThickness(), width(),
-                       theme_frame->height());
+  canvas->TileImageInt(*frame_image, 0, FrameBorderThickness(), width(),
+                       frame_image->height());
 
   // The bottom of the titlebar actually comes from the top of the Client Edge
   // graphic, with the actual client edge clipped off the bottom.