Support DWM switching....

chrome/browser/views/toolbar_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/toolbar_view.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 28 matching lines @@
 #include "chrome/common/win_util.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
 #include "chrome/views/background.h"
 #include "chrome/views/button_dropdown.h"
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/label.h"
 #include "chrome/views/non_client_view.h"
 #include "chrome/views/tooltip_manager.h"
-#include "chrome/views/widget.h"
+#include "chrome/views/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 
 static const int kControlHorizOffset = 4;
 static const int kControlVertOffset = 6;
 static const int kControlIndent = 3;
 static const int kStatusBubbleWidth = 480;
 
@@ skipping 286 matching lines @@
   if (!browser_->window() || !browser_->window()->IsMaximized()) {
     int top_spacing = PopupTopSpacing();
     canvas->DrawBitmapInt(*kPopupBackgroundEdge, 0, top_spacing);
     canvas->DrawBitmapInt(*kPopupBackgroundEdge,
                           width() - kPopupBackgroundEdge->width(), top_spacing);
   }
 
   // For glass, we need to draw a black line below the location bar to separate
   // it from the content area.  For non-glass, the NonClientView draws the
   // toolbar background below the location bar for us.
-  if (win_util::ShouldUseVistaFrame())
+  if (GetWidget()->AsWindow()->UseNativeFrame())
     canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1);
 }
 
 void BrowserToolbarView::DidGainFocus() {
   // Check to see if MSAA focus should be restored to previously focused button,
   // and if button is an enabled, visibled child of toolbar.
   if (!acc_focused_view_ ||
       (acc_focused_view_->GetParent()->GetID() != VIEW_ID_TOOLBAR) ||
       !acc_focused_view_->IsEnabled() ||
       !acc_focused_view_->IsVisible()) {
@@ skipping 122 matching lines @@
 gfx::Size BrowserToolbarView::GetPreferredSize() {
   if (IsDisplayModeNormal()) {
     static SkBitmap normal_background;
     if (normal_background.isNull()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
     }
     return gfx::Size(0, normal_background.height());
   }
 
-  int vertical_spacing = PopupTopSpacing() + (win_util::ShouldUseVistaFrame() ?
-      kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
+  int vertical_spacing = PopupTopSpacing() +
+      (GetWidget()->AsWindow()->UseNativeFrame() ? kPopupBottomSpacingGlass
+                                                 : kPopupBottomSpacingNonGlass);
   return gfx::Size(0, location_bar_->GetPreferredSize().height() +
       vertical_spacing);
 }
 
 void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
   Menu::AnchorPoint anchor = Menu::TOPRIGHT;
   if (UILayoutIsRightToLeft())
     anchor = Menu::TOPLEFT;
 
   Menu menu(this, anchor, hwnd);
@@ skipping 287 matching lines @@
   if (button)
     button->SetEnabled(enabled);
 }
 
 void BrowserToolbarView::ButtonPressed(views::BaseButton* sender) {
   browser_->ExecuteCommand(sender->GetTag());
 }
 
 // static
 int BrowserToolbarView::PopupTopSpacing() {
-  return win_util::ShouldUseVistaFrame() ? 0 : kPopupTopSpacingNonGlass;
+  return GetWidget()->AsWindow()->UseNativeFrame() ? 0 
+                                                   : kPopupTopSpacingNonGlass;
 }
 
 void BrowserToolbarView::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::wstring* pref_name = Details<std::wstring>(details).ptr();
     if (*pref_name == prefs::kShowHomeButton) {
       Layout();
       SchedulePaint();
@@ skipping 14 matching lines @@
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }