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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index af0ffa1f0a5d357ee760b27b7ec8c5937e8419f5..93b503d24a1e91b4b816eb165d1d4933a2175da8 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
-#include <shellapi.h>
 #include <windows.h>
+#include <shellapi.h>
 #endif  // OS_WIN
 
 #include <algorithm>
@@ -136,7 +136,7 @@
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_WIN)
-#include "app/win/shell.h"
+#include "base/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"
@@ -431,7 +431,7 @@ void Browser::InitBrowserWindow() {
 
     // Set the app user model id for this application to that of the application
     // name.  See http://crbug.com/7028.
-    app::win::SetAppIdForWindow(
+    base::win::SetAppIdForWindow(
         is_app() ?
         ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
         ShellIntegration::GetChromiumAppId(profile_->GetPath()),