Reland "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 a60947fc4f5068322788b1d4f879b17c026a06f3..04c2ad25acb4bbad88e8e24edaf9b0f27f212bb6 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>
@@ -138,13 +138,13 @@
 #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)
@@ -439,7 +439,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(
+    ui::win::SetAppIdForWindow(
         is_app() ?
         ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
         ShellIntegration::GetChromiumAppId(profile_->GetPath()),