Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

chrome/browser/aeropeek_manager.cc

 // Copyright (c) 2011 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/win/shell.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_native_library.h"
-#include "base/scoped_comptr_win.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/app_icon_win.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 231 matching lines @@
         BrowserDistribution::GetDistribution()->GetBrowserAppId(), window_);
 
     // Register this place-holder window to the taskbar as a child of
     // the browser window and add it to the end of its tab list.
     // Correctly, this registration should be called after this browser window
     // receives a registered window message "TaskbarButtonCreated", which
     // means that Windows creates a taskbar button for this window in its
     // taskbar. But it seems to be OK to register it without checking the
     // message.
     // TODO(hbono): we need to check this registered message?
-    ScopedComPtr<ITaskbarList3> taskbar;
+    base::win::ScopedComPtr<ITaskbarList3> taskbar;
     if (FAILED(taskbar.CreateInstance(CLSID_TaskbarList, NULL,
                                       CLSCTX_INPROC_SERVER)) ||
         FAILED(taskbar->HrInit()) ||
         FAILED(taskbar->RegisterTab(window_, frame_window_)) ||
         FAILED(taskbar->SetTabOrder(window_, NULL)))
       return;
     if (active_)
       taskbar->SetTabActive(window_, frame_window_, 0);
   }
 
@@ skipping 447 matching lines @@
   tab_active_ = true;
 
   // Create a place-holder window and add it to the tab list if it has not been
   // created yet. (This case happens when we re-attached a detached window.)
   if (!IsWindow(hwnd())) {
     Update(false);
     return;
   }
 
   // Notify Windows to set the thumbnail focus to this window.
-  ScopedComPtr<ITaskbarList3> taskbar;
+  base::win::ScopedComPtr<ITaskbarList3> taskbar;
   HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
                                           CLSCTX_INPROC_SERVER);
   if (FAILED(result)) {
     LOG(ERROR) << "failed creating an ITaskbarList3 interface.";
     return;
   }
 
   result = taskbar->HrInit();
   if (FAILED(result)) {
     LOG(ERROR) << "failed initializing an ITaskbarList3 interface.";
@@ skipping 33 matching lines @@
   // we don't have enough information to create a thumbnail.
   if (tab_active_ || !is_loading)
     UpdateThumbnail();
 }
 
 void AeroPeekWindow::Destroy() {
   if (!IsWindow(hwnd()))
     return;
 
   // Remove this window from the tab list of Windows.
-  ScopedComPtr<ITaskbarList3> taskbar;
+  base::win::ScopedComPtr<ITaskbarList3> taskbar;
   HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
                                           CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return;
 
   result = taskbar->HrInit();
   if (FAILED(result))
     return;
 
   result = taskbar->UnregisterTab(hwnd());
@@ skipping 441 matching lines @@
   // This code is just copied from "thumbnail_generator.cc".
   skia::PlatformCanvas canvas;
   if (!backing_store->CopyFromBackingStore(gfx::Rect(backing_store->size()),
                                            &canvas))
     return false;
 
   const SkBitmap& bitmap = canvas.getTopPlatformDevice().accessBitmap(false);
   bitmap.copyTo(preview, SkBitmap::kARGB_8888_Config);
   return true;
 }