Merge 22783 - Ensure that popups windows are not themed....

chrome/browser/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/frame/opaque_browser_frame_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ skipping 107 matching lines @@
           close_button_(new views::ImageButton(this))),
       window_icon_(NULL),
       frame_(frame),
       browser_view_(browser_view) {
   InitClass();
 
   ThemeProvider* tp = frame_->GetThemeProviderForFrame();
   SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background =
       tp->GetBitmapNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND);
-
   minimize_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_MINIMIZE));
   minimize_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_MINIMIZE_H));
   minimize_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_MINIMIZE_P));
-  minimize_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_MINIMIZE_BUTTON_MASK));
+  if (browser_view_->IsBrowserTypeNormal())
+    minimize_button_->SetBackground(color, background,
+        tp->GetBitmapNamed(IDR_MINIMIZE_BUTTON_MASK));
   minimize_button_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_MINIMIZE));
   AddChildView(minimize_button_);
 
   maximize_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_MAXIMIZE));
   maximize_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_MAXIMIZE_H));
   maximize_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_MAXIMIZE_P));
-  maximize_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_MAXIMIZE_BUTTON_MASK));
+  if (browser_view_->IsBrowserTypeNormal())
+    maximize_button_->SetBackground(color, background,
+        tp->GetBitmapNamed(IDR_MAXIMIZE_BUTTON_MASK));
   maximize_button_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_MAXIMIZE));
   AddChildView(maximize_button_);
 
   restore_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_RESTORE));
   restore_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_RESTORE_H));
   restore_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_RESTORE_P));
-  restore_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_RESTORE_BUTTON_MASK));
+  if (browser_view_->IsBrowserTypeNormal())
+    restore_button_->SetBackground(color, background,
+        tp->GetBitmapNamed(IDR_RESTORE_BUTTON_MASK));
   restore_button_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_RESTORE));
   AddChildView(restore_button_);
 
   close_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       tp->GetBitmapNamed(IDR_CLOSE));
   close_button_->SetImage(
       views::CustomButton::BS_HOT,
       tp->GetBitmapNamed(IDR_CLOSE_H));
   close_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_CLOSE_P));
-  close_button_->SetBackground(color, background,
-      tp->GetBitmapNamed(IDR_CLOSE_BUTTON_MASK));
+  if (browser_view_->IsBrowserTypeNormal())
+    close_button_->SetBackground(color, background,
+        tp->GetBitmapNamed(IDR_CLOSE_BUTTON_MASK));
   close_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
 
   // Initializing the TabIconView is expensive, so only do it if we need to.
   if (browser_view_->ShouldShowWindowIcon()) {
     window_icon_ = new TabIconView(this);
     window_icon_->set_is_light(true);
     AddChildView(window_icon_);
     window_icon_->Update();
   }
@@ skipping 358 matching lines @@
   SkBitmap* bottom_left_corner =
       tp->GetBitmapNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER);
   SkBitmap* bottom_right_corner =
       tp->GetBitmapNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER);
   SkBitmap* bottom_edge = tp->GetBitmapNamed(IDR_WINDOW_BOTTOM_CENTER);
 
 
   // Window frame mode and color
   SkBitmap* theme_frame;
   SkColor frame_color;
-  if (!browser_view_->IsOffTheRecord()) {
+
+  // Never theme app and popup windows.
+  if (!browser_view_->IsBrowserTypeNormal()) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    if (frame_->GetWindow()->IsActive()) {
+      theme_frame = rb.GetBitmapNamed(IDR_FRAME);
+      frame_color = browser_view_->IsOffTheRecord() ?
+          ResourceBundle::frame_color_incognito :
+          ResourceBundle::frame_color;
+    } else {
+      theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
+      frame_color = browser_view_->IsOffTheRecord() ?
+          ResourceBundle::frame_color_incognito_inactive :
+          ResourceBundle::frame_color_inactive;
+    }
+  } else if (!browser_view_->IsOffTheRecord()) {
     if (frame_->GetWindow()->IsActive()) {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME);
       frame_color = tp->GetColor(BrowserThemeProvider::COLOR_FRAME);
     } else {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
       frame_color = tp->GetColor(BrowserThemeProvider::COLOR_FRAME_INACTIVE);
     }
   } else {
     if (frame_->GetWindow()->IsActive()) {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO);
@@ skipping 18 matching lines @@
   // 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());
 
   // Draw the theme frame overlay
-  if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) {
+  if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
+      browser_view_->IsBrowserTypeNormal()) {
     SkBitmap* theme_overlay;
     if (frame_->GetWindow()->IsActive())
       theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY);
     else
       theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
     canvas->DrawBitmapInt(*theme_overlay, 0, 0);
   }
 
   // Top.
   int top_left_height = std::min(top_left_corner->height(),
@@ skipping 34 matching lines @@
       height() - top_left_height - bottom_left_corner->height());
 }
 
 
 void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
   ThemeProvider* tp = GetThemeProvider();
   views::Window* window = frame_->GetWindow();
 
   // Window frame mode and color
   SkBitmap* theme_frame;
-  if (!browser_view_->IsOffTheRecord()) {
+
+  // Never theme app and popup windows.
+  if (!browser_view_->IsBrowserTypeNormal()) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    if (frame_->GetWindow()->IsActive())
+      theme_frame = rb.GetBitmapNamed(IDR_FRAME);
+    else
+      theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
+  } else if (!browser_view_->IsOffTheRecord()) {
     theme_frame = window->IsActive() ?
         tp->GetBitmapNamed(IDR_THEME_FRAME) :
         tp->GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
   } else {
     theme_frame = window->IsActive() ?
         tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO) :
         tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_INACTIVE);
   }
 
   // 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)) {
+  if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
+      browser_view_->IsBrowserTypeNormal()) {
     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
     // it off the bottom.
     SkBitmap* top_center =
         tp->GetBitmapNamed(IDR_APP_TOP_CENTER);
@@ skipping 334 matching lines @@
   if (!initialized) {
 #if defined(OS_WIN)
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #else
     NOTIMPLEMENTED();
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }