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

views/window/custom_frame_view.cc

 // Copyright (c) 2009 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 "views/window/custom_frame_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
@@ skipping 281 matching lines @@
   *title_thickness = std::max(title_font_->height(),
       min_titlebar_height - *title_top_spacing - title_bottom_spacing);
   return *title_top_spacing + *title_thickness + title_bottom_spacing +
       BottomEdgeThicknessWithinNonClientHeight();
 }
 
 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;
   }
 
   SkBitmap* top_left_corner = rb.GetBitmapNamed(IDR_WINDOW_TOP_LEFT_CORNER);
   SkBitmap* top_right_corner =
       rb.GetBitmapNamed(IDR_WINDOW_TOP_RIGHT_CORNER);
   SkBitmap* top_edge = rb.GetBitmapNamed(IDR_WINDOW_TOP_CENTER);
   SkBitmap* right_edge = rb.GetBitmapNamed(IDR_WINDOW_RIGHT_SIDE);
   SkBitmap* left_edge = rb.GetBitmapNamed(IDR_WINDOW_LEFT_SIDE);
   SkBitmap* bottom_left_corner =
       rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER);
   SkBitmap* bottom_right_corner =
       rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER);
   SkBitmap* bottom_edge = rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_CENTER);
 
   // 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(),
       width() - left_edge->width() - right_edge->width(),
       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);
   canvas->TileImageInt(*top_edge, top_left_corner->width(), 0,
                        width() - top_right_corner->width(), top_edge->height());
   canvas->DrawBitmapInt(*top_right_corner,
                         width() - top_right_corner->width(), 0);
 
   // Right.
   canvas->TileImageInt(*right_edge, width() - right_edge->width(),
@@ skipping 16 matching lines @@
   // Left.
   canvas->TileImageInt(*left_edge, 0, top_left_corner->height(),
       left_edge->width(),
       height() - top_left_corner->height() - bottom_left_corner->height());
 }
 
 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.
   SkBitmap* titlebar_bottom = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
   int edge_height = titlebar_bottom->height() - kClientEdgeThickness;
   canvas->TileImageInt(*titlebar_bottom, 0,
       frame_->GetClientView()->y() - edge_height, width(), edge_height);
 }
 
 void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
@@ skipping 196 matching lines @@
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO: need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views