Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories.

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/scoped_native_library.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/favicon/favicon_tab_helper.h"
 #include "chrome/browser/sessions/restore_tab_helper.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"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/win/shell.h"
 #include "ui/base/win/window_impl.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/icon_util.h"
 #include "views/widget/native_widget_win.h"
 
 namespace {
 
 // Macros and COM interfaces used in this file.
 // These interface declarations are copied from Windows SDK 7.
 // TODO(hbono): Bug 16903: to be deleted when we use Windows SDK 7.
@@ skipping 199 matching lines @@
   }
 
  private:
   void Run() {
     // Set the App ID of the browser for this place-holder window to tell
     // that this window is a child of the browser application, i.e. to tell
     // that this thumbnail window should be displayed when we hover the
     // browser icon in the taskbar.
     // TODO(mattm): This should use ShellIntegration::GetChromiumAppId to work
     // properly with multiple profiles.
-    ui::win::SetAppIdForWindow(
+    app::win::SetAppIdForWindow(
         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?
@@ skipping 967 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 = skia::GetTopDevice(canvas)->accessBitmap(false);
   bitmap.copyTo(preview, SkBitmap::kARGB_8888_Config);
   return true;
 }