Adds a command-line option that disables AeroPeek....

chrome/browser/aeropeek_manager.cc

 // Copyright (c) 2010 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/aeropeek_manager.h"
 
 #include <dwmapi.h>
 #include <shobjidl.h>
 
 #include "app/gfx/gdi_util.h"
@@ skipping 1000 matching lines @@
   }
 }
 
 void AeroPeekManager::SetContentInsets(const gfx::Insets& insets) {
   content_insets_ = insets;
 }
 
 // static
 bool AeroPeekManager::Enabled() {
   // We enable our custom AeroPeek only when:
-  // * Chrome is running on Windows 7, and
-  // * Chrome is not lauched in the application mode.
-  return win_util::GetWinVersion() >= win_util::WINVERSION_WIN7 &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp);
+  // * Chrome is running on Windows 7,
+  // * Chrome is not lauched in the application mode, and
+  // * Aero is enabled.
+  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7 ||
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAeroPeek) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp))
+    return false;
+
+  return win_util::ShouldUseVistaFrame();
 }
 
 void AeroPeekManager::DeleteAeroPeekWindow(int tab_id) {
   // This function does NOT call AeroPeekWindow::Destroy() before deleting
   // the AeroPeekWindow instance.
   for (std::list<AeroPeekWindow*>::iterator i = tab_list_.begin();
        i != tab_list_.end(); ++i) {
     AeroPeekWindow* window = *i;
     if (window->tab_id() == tab_id) {
       tab_list_.erase(i);
@@ skipping 178 matching lines @@
   skia::PlatformCanvas canvas;
   if (!backing_store->CopyFromBackingStore(gfx::Rect(gfx::Point(0, 0),
                                                      backing_store->size()),
                                            &canvas))
     return false;
 
   const SkBitmap& bitmap = canvas.getTopPlatformDevice().accessBitmap(false);
   bitmap.copyTo(preview, SkBitmap::kARGB_8888_Config);
   return true;
 }