Start to remove / rearrange some header files

atom/browser/process_singleton.h

@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
 #define CHROME_BROWSER_PROCESS_SINGLETON_H_
 
-#include "build/build_config.h"
-
 #if defined(OS_WIN)
 #include <windows.h>
 #endif  // defined(OS_WIN)

atom/browser/process_singleton_posix.cc

@@ -37,7 +37,7 @@
 // retrieves the process id from the symbol link and kills it by sending
 // SIGKILL. Then the second process starts as normal.
 
-#include "chrome/browser/process_singleton.h"
+#include "process_singleton.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -77,21 +77,10 @@
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_LINUX)
-#include "chrome/browser/ui/process_singleton_dialog_linux.h"
-#endif
-
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "ui/views/linux_ui/linux_ui.h"
-#endif
-
 using content::BrowserThread;
 
 namespace {

atom/browser/process_singleton_startup_lock.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/process_singleton_startup_lock.h"
+#include "process_singleton_startup_lock.h"
 
 #include "base/bind.h"
 #include "base/logging.h"

atom/browser/process_singleton_startup_lock.h

@@ -13,7 +13,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/threading/non_thread_safe.h"
-#include "chrome/browser/process_singleton.h"
+#include "process_singleton.h"
 
 // Provides a ProcessSingleton::NotificationCallback that can queue up
 // command-line invocations during startup and execute them when startup

atom/browser/process_singleton_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/process_singleton.h"
+#include "process_singleton.h"
 
 #include <shellapi.h>
 
@@ -20,18 +20,10 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chrome_process_finder_win.h"
-#include "chrome/browser/metro_utils/metro_chrome_win.h"
-#include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/simple_message_box.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_paths_internal.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/installer/util/wmi.h"
+//#include "chrome/browser/browser_process.h"
+//#include "chrome/browser/browser_process_platform_part.h"
+#include "chrome_process_finder_win.h"   // TODO: Pull this in
+//#include "chrome/browser/shell_integration.h"  // TODO: Maybe pull this in?
 #include "content/public/common/result_codes.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"