Fix bubbles deactivating the opaque frame....

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 566 matching lines @@
   SkBitmap* bottom_edge = tp->GetBitmapNamed(IDR_WINDOW_BOTTOM_CENTER);
 
 
   // Window frame mode and color
   SkBitmap* theme_frame;
   SkColor frame_color;
 
   // Never theme app and popup windows.
   if (!browser_view_->IsBrowserTypeNormal()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    if (frame_->GetWindow()->IsActive()) {
+    if (ShouldPaintAsActive()) {
       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()) {
+    if (ShouldPaintAsActive()) {
       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()) {
+    if (ShouldPaintAsActive()) {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO);
       frame_color = tp->GetColor(BrowserThemeProvider::COLOR_FRAME_INCOGNITO);
     } else {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_INACTIVE);
       frame_color = tp->GetColor(
           BrowserThemeProvider::COLOR_FRAME_INCOGNITO_INACTIVE);
     }
   }
 
   // Fill with the frame color first so we have a constant background for
@@ skipping 12 matching lines @@
       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) &&
       browser_view_->IsBrowserTypeNormal()) {
     SkBitmap* theme_overlay;
-    if (frame_->GetWindow()->IsActive())
+    if (ShouldPaintAsActive())
       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(),
                                  height() - bottom_left_corner->height());
   canvas->DrawBitmapInt(*top_left_corner, 0, 0, top_left_corner->width(),
@@ skipping 36 matching lines @@
 void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
   ThemeProvider* tp = GetThemeProvider();
   views::Window* window = frame_->GetWindow();
 
   // Window frame mode and color
   SkBitmap* theme_frame;
 
   // Never theme app and popup windows.
   if (!browser_view_->IsBrowserTypeNormal()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    if (frame_->GetWindow()->IsActive())
+    if (ShouldPaintAsActive())
       theme_frame = rb.GetBitmapNamed(IDR_FRAME);
     else
       theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
   } else if (!browser_view_->IsOffTheRecord()) {
-    theme_frame = window->IsActive() ?
+    theme_frame = ShouldPaintAsActive() ?
         tp->GetBitmapNamed(IDR_THEME_FRAME) :
         tp->GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
   } else {
-    theme_frame = window->IsActive() ?
+    theme_frame = ShouldPaintAsActive() ?
         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) &&
       browser_view_->IsBrowserTypeNormal()) {
-    SkBitmap* theme_overlay = frame_->GetWindow()->IsActive() ?
+    SkBitmap* theme_overlay = ShouldPaintAsActive() ?
         tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY) :
         tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
     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 =
@@ skipping 350 matching lines @@
   static bool initialized = false;
   if (!initialized) {
 #if defined(OS_WIN)
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #else
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }