Enable building of browser/debugger/debugger_{contents,shell}.cc on Linux.

This required getting rid of the stubs in common/temp_scaffolding_stubs.cc
to avoid duplicate symbols, in favor of moving the stubs into a separate
module for use when porting to new platforms.
Review URL: http://codereview.chromium.org/43089

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

3 files changed, 26 insertions, 20 deletions

diff --git a/chrome/browser/debugger/debugger_shell_stubs.cc b/chrome/browser/debugger/debugger_shell_stubs.cc
new file mode 100644
index 0000000..edf1d4f
--- /dev/null
+++ b/chrome/browser/debugger/debugger_shell_stubs.cc
@@ -0,0 +1,20 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/debugger/debugger_shell.h"
+
+#ifndef CHROME_DEBUGGER_DISABLED
+DebuggerShell::DebuggerShell(DebuggerInputOutput *io) { }
+DebuggerShell::~DebuggerShell() { }
+void DebuggerShell::Start() { NOTIMPLEMENTED(); }
+void DebuggerShell::Debug(TabContents* tab) { NOTIMPLEMENTED(); }
+void DebuggerShell::DebugMessage(const std::wstring& msg) { NOTIMPLEMENTED(); }
+void DebuggerShell::OnDebugAttach() { NOTIMPLEMENTED(); }
+void DebuggerShell::OnDebugDisconnect() { NOTIMPLEMENTED(); }
+void DebuggerShell::DidConnect() { NOTIMPLEMENTED(); }
+void DebuggerShell::DidDisconnect() { NOTIMPLEMENTED(); }
+void DebuggerShell::ProcessCommand(const std::wstring& data) {
+  NOTIMPLEMENTED();
+}
+#endif  // !CHROME_DEBUGGER_DISABLED
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7247def..8686f84 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -518,6 +518,8 @@
         'browser/debugger/debugger_node.h',
         'browser/debugger/debugger_shell.cc',
         'browser/debugger/debugger_shell.h',
+        'browser/debugger/debugger_shell_stubs.cc',
+        'browser/debugger/debugger_shell_stubs.h',
         'browser/debugger/debugger_view.cc',
         'browser/debugger/debugger_view.h',
         'browser/debugger/debugger_window.cc',
@@ -1168,11 +1170,8 @@
       'conditions': [
         ['OS=="linux"', {
           'sources!': [
-            # TODO(port):  Port these.
-            'browser/debugger/debugger_contents.cc',
-            'browser/debugger/debugger_shell.cc',
-
-            # Exclude Windows-specific files.
+            'browser/debugger/debugger_shell_stubs.cc',
+            # Windows-specific files.
             'browser/download/download_exe.cc',
             'browser/download/download_util.cc',
           ],
@@ -1191,6 +1190,7 @@
             'browser/autocomplete/autocomplete_popup_model.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
+            'browser/debugger/debugger_shell_stubs.cc',
             'browser/dom_ui/dev_tools_ui.cc',
             'browser/dom_ui/dev_tools_ui.h',
           ],
@@ -1214,6 +1214,7 @@
             'browser/history/history_indexer.idl',
           ],
           'sources!': [
+            'browser/debugger/debugger_shell_stubs.cc',
             'browser/history/history_publisher_none.cc',
           ],
         }, {  # 'OS!="win"
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 5d7f5c3..93c7064 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -327,21 +327,6 @@ bool IsDefaultPluginEnabled() {
 
 }  // webkit_glue
 
-#ifndef CHROME_DEBUGGER_DISABLED
-DebuggerShell::DebuggerShell(DebuggerInputOutput *io) { }
-DebuggerShell::~DebuggerShell() { }
-void DebuggerShell::Start() { NOTIMPLEMENTED(); }
-void DebuggerShell::Debug(TabContents* tab) { NOTIMPLEMENTED(); }
-void DebuggerShell::DebugMessage(const std::wstring& msg) { NOTIMPLEMENTED(); }
-void DebuggerShell::OnDebugAttach() { NOTIMPLEMENTED(); }
-void DebuggerShell::OnDebugDisconnect() { NOTIMPLEMENTED(); }
-void DebuggerShell::DidConnect() { NOTIMPLEMENTED(); }
-void DebuggerShell::DidDisconnect() { NOTIMPLEMENTED(); }
-void DebuggerShell::ProcessCommand(const std::wstring& data) {
-  NOTIMPLEMENTED();
-}
-#endif  // !CHROME_DEBUGGER_DISABLED
-
 MemoryDetails::MemoryDetails() {
   NOTIMPLEMENTED();
 }