More theme bits for the NTP and window frame.

BUG=12768,13352
TEST=Verify that a theme with attribution works on the NTP and a theme with an overlay shows up

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

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

1 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 06777cb..5d73082 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -580,6 +580,12 @@ void OpaqueBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   // Draw the theme frame.
   canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
 
+  // Draw the theme frame overlay
+  if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) {
+    SkBitmap* theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY);
+    canvas->DrawBitmapInt(*theme_overlay, 0, 0);
+  }
+
   // Top.
   int top_left_height = std::min(top_left_corner->height(),
                                  height() - bottom_left_corner->height());
@@ -639,6 +645,12 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
   // Draw the theme frame.
   canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
 
+  // Draw the theme frame overlay
+  if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) {
+    SkBitmap* theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY);
+    canvas->DrawBitmapInt(*theme_overlay, 0, 0);
+  }
+
   if (!browser_view_->IsToolbarVisible()) {
     // There's no toolbar to edge the frame border, so we need to draw a bottom
     // edge.  The graphic we use for this has a built in client edge, so we clip