DevTools: enable out of process dev tools by default. Take 2.

Review URL: http://codereview.chromium.org/115292

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15947 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 9f0d027..5edfafc 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -2117,11 +2117,11 @@ void Browser::InitCommandState() {
   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
 #if defined(OS_WIN)
   // Command line debugger conflicts with the new oop one.
-  bool oop_devtools = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableOutOfProcessDevTools);
+  bool in_proc_devtools = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableOutOfProcessDevTools);
   command_updater_.UpdateCommandEnabled(IDC_DEBUGGER,
       // The debugger doesn't work in single process mode.
-      !oop_devtools && !RenderProcessHost::run_renderer_in_process());
+      in_proc_devtools && !RenderProcessHost::run_renderer_in_process());
 #endif
   command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true);
diff --git a/chrome/browser/debugger/debugger_wrapper.cc b/chrome/browser/debugger/debugger_wrapper.cc
index 8033a83..5f01b9d 100644
--- a/chrome/browser/debugger/debugger_wrapper.cc
+++ b/chrome/browser/debugger/debugger_wrapper.cc
@@ -17,8 +17,8 @@
 DebuggerWrapper::DebuggerWrapper(int port) {
 #ifndef CHROME_DEBUGGER_DISABLED
   if (port > 0) {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableOutOfProcessDevTools)) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisableOutOfProcessDevTools)) {
       DebuggerInputOutputSocket *io = new DebuggerInputOutputSocket(port);
       debugger_ = new DebuggerShell(io);
       debugger_->Start();
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index fce7128..f960a1e 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -263,7 +263,7 @@ bool BrowserRenderProcessHost::Init() {
     switches::kEnableWebWorkers,
     switches::kEnableStatsTable,
     switches::kEnableExtensions,
-    switches::kEnableOutOfProcessDevTools,
+    switches::kDisableOutOfProcessDevTools,
     switches::kAutoSpellCorrect,
     switches::kDisableAudio,
     switches::kSimpleDataSource,
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 3519497..0083ad9 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -560,8 +560,8 @@ void RenderViewHost::CopyImageAt(int x, int y) {
 }
 
 void RenderViewHost::InspectElementAt(int x, int y) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableOutOfProcessDevTools)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableOutOfProcessDevTools)) {
     DevToolsManager* manager = g_browser_process->devtools_manager();
     manager->InspectElement(this, x, y);
   } else {
@@ -572,8 +572,8 @@ void RenderViewHost::InspectElementAt(int x, int y) {
 }
 
 void RenderViewHost::ShowJavaScriptConsole() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableOutOfProcessDevTools)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableOutOfProcessDevTools)) {
     DevToolsManager* manager = g_browser_process->devtools_manager();
     manager->OpenDevToolsWindow(this);
   } else {