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

chrome/browser/views/frame/browser_frame_win.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/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "app/resource_bundle.h"
@@ skipping 33 matching lines @@
       saved_window_ex_style_(0),
       detached_drag_mode_(false),
       drop_tabstrip_(NULL),
       root_view_(NULL),
       frame_initialized_(false),
       profile_(profile) {
   browser_view_->set_frame(this);
   GetNonClientView()->SetFrameView(CreateFrameViewForWindow());
   // Don't focus anything on creation, selecting a tab will set the focus.
   set_focus_on_creation(false);
+  // Force popups and apps under Vista to have a nonthemed frame.
+  if (win_util::ShouldUseVistaFrame() &&
+      !browser_view_->IsBrowserTypeNormal())
+    GetNonClientView()->ForceAeroGlassFrame();
 }
 
 void BrowserFrameWin::Init() {
   WindowWin::Init(NULL, gfx::Rect());
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
 views::Window* BrowserFrameWin::GetWindow() {
@@ skipping 227 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, views::CustomFrameWindow overrides:
 
 int BrowserFrameWin::GetShowState() const {
   return browser_view_->GetShowState();
 }
 
 views::NonClientFrameView* BrowserFrameWin::CreateFrameViewForWindow() {
-  if (GetThemeProvider()->ShouldUseNativeFrame())
+  if (GetThemeProvider()->ShouldUseNativeFrame() ||
+      (!browser_view_->IsBrowserTypeNormal() &&
+      win_util::ShouldUseVistaFrame()))
     browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
   else
     browser_frame_view_ = new OpaqueBrowserFrameView(this, browser_view_);
   return browser_frame_view_;
 }
 
 void BrowserFrameWin::UpdateFrameAfterFrameChange() {
   WindowWin::UpdateFrameAfterFrameChange();
   UpdateDWMFrame();
 }
@@ skipping 50 matching lines @@
     // more "transparent" look.
     ::SetWindowLong(frame_hwnd, GWL_STYLE,
                     saved_window_style_ & ~WS_CAPTION);
     SetLayeredWindowAttributes(frame_hwnd, RGB(0xFF, 0xFF, 0xFF),
                                kTabDragWindowAlpha, LWA_ALPHA);
   } else {
     ::SetWindowLong(frame_hwnd, GWL_STYLE, saved_window_style_);
     ::SetWindowLong(frame_hwnd, GWL_EXSTYLE, saved_window_ex_style_);
   }
 }