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

Unified Diff: content/browser/browser_main_runner.cc

Issue 16328003: Move a bunch of child-only code from content/common to content/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some sort orders Created 7 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: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 175b62fe920d1752f08f0c3928bc73123f0efbe8..54fe6bf41e28c607b5dd4b8f3f2a3c6039d45865 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -13,15 +13,15 @@
#include "base/metrics/statistics_recorder.h"
#include "content/browser/browser_main_loop.h"
#include "content/browser/notification_service_impl.h"
-#include "content/common/child_process.h"
+#include "content/common/debug_util.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#if defined(OS_WIN)
#include "base/win/metro.h"
#include "base/win/windows_version.h"
-#include "ui/base/win/scoped_ole_initializer.h"
#include "ui/base/ime/win/tsf_bridge.h"
+#include "ui/base/win/scoped_ole_initializer.h"
#endif
bool g_exited_main_message_loop = false;
@@ -47,11 +47,10 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
is_initialized_ = true;
#if !defined(OS_IOS)
- // ChildProcess:: is a misnomer unless you consider context. Use
- // of --wait-for-debugger only makes sense when Chrome itself is a
+ // Use of --wait-for-debugger only makes sense when Chrome itself is a
// child process (e.g. when launched by PyAuto).
if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
- ChildProcess::WaitForDebugger("Browser");
+ WaitForDebugger("Browser");
jam 2013/06/05 16:54:58 actually, you can take out this whole section. thi
scottmg 2013/06/05 17:19:27 Done.
#endif // !defined(OS_IOS)
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698