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

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
+#include <shellapi.h>
 #include <windows.h>
-#include <shellapi.h>
 #endif  // OS_WIN
 
 #include <algorithm>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 111 matching lines @@
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_WIN)
+#include "app/win/shell.h"
 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "ui/base/win/shell.h"
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
 #include "content/browser/find_pasteboard.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/extensions/file_manager_util.h"
 #endif
@@ skipping 274 matching lines @@
   window_ = CreateBrowserWindow();
 
 #if defined(OS_WIN)
   {
     // TODO: This might hit the disk
     //   http://code.google.com/p/chromium/issues/detail?id=61638
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 
     // Set the app user model id for this application to that of the application
     // name.  See http://crbug.com/7028.
-    ui::win::SetAppIdForWindow(
+    app::win::SetAppIdForWindow(
         is_app() ?
         ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
         ShellIntegration::GetChromiumAppId(profile_->GetPath()),
         window()->GetNativeHandle());
   }
 #endif
 
   NotificationService::current()->Notify(
       NotificationType::BROWSER_WINDOW_READY,
       Source<Browser>(this),
@@ skipping 4273 matching lines @@
     // end up querying state once they process the tab switch.
     return;
   }
 
   BookmarkBar::AnimateChangeType animate_type =
       (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ?
       BookmarkBar::ANIMATE_STATE_CHANGE :
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE;
   window_->BookmarkBarStateChanged(animate_type);
 }