summaryrefslogtreecommitdiffstats
path: root/content/app/content_main_runner.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/app/content_main_runner.cc')
-rw-r--r--content/app/content_main_runner.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index cfe320a..147b5a0 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -11,7 +11,7 @@
#include "base/command_line.h"
#include "base/debug/debugger.h"
#include "base/debug/trace_event.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
#include "base/i18n/icu_util.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
@@ -20,9 +20,9 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/profiler/alternate_timer.h"
+#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/string_number_conversions.h"
#include "content/browser/browser_main.h"
#include "content/common/set_process_title.h"
#include "content/common/url_schemes.h"
@@ -39,8 +39,8 @@
#include "ipc/ipc_switches.h"
#include "media/base/media.h"
#include "sandbox/win/src/sandbox_types.h"
-#include "ui/base/ui_base_switches.h"
#include "ui/base/ui_base_paths.h"
+#include "ui/base/ui_base_switches.h"
#include "ui/base/win/dpi.h"
#include "webkit/user_agent/user_agent.h"
@@ -59,10 +59,10 @@
#endif
#if defined(OS_WIN)
-#include <cstring>
#include <atlbase.h>
#include <atlapp.h>
#include <malloc.h>
+#include <cstring>
#elif defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
#if !defined(OS_IOS)