Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1189)

Unified Diff: chrome/browser/browser_main.cc

Issue 7231016: Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 51537b70bc388f0136ff0baabe721405149f2236..0935e8987a22ee23c93c00aeb5ce3f7f692eca87 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -158,11 +158,11 @@
// progress and should not be taken as an indication of a real refactoring.
#if defined(OS_WIN)
+#include <windows.h>
#include <commctrl.h>
#include <shellapi.h>
-#include <windows.h>
-#include "app/win/scoped_com_initializer.h"
+#include "base/win/scoped_com_initializer.h"
#include "base/win/windows_version.h"
#include "chrome/browser/browser_trial.h"
#include "chrome/browser/browser_util_win.h"
@@ -1697,7 +1697,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
preconnect_enabled);
#if defined(OS_WIN)
- app::win::ScopedCOMInitializer com_initializer;
+ base::win::ScopedCOMInitializer com_initializer;
#if defined(GOOGLE_CHROME_BUILD)
// Init the RLZ library. This just binds the dll and schedules a task on the

Powered by Google App Engine
This is Rietveld 408576698