diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-13 00:49:00 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-13 00:49:00 +0000 |
commit | b594e5172124665454fbff6e3d7d755859efa4b7 (patch) | |
tree | 8bf97a8f80fa440120dff2a7a4272bda9ece780e /chrome/browser | |
parent | 2e68f567854b6887e052ac698fdbef61f4f0e08f (diff) | |
download | chromium_src-b594e5172124665454fbff6e3d7d755859efa4b7.zip chromium_src-b594e5172124665454fbff6e3d7d755859efa4b7.tar.gz chromium_src-b594e5172124665454fbff6e3d7d755859efa4b7.tar.bz2 |
Reverting 9706. Hopefully this will fix the broken debugger_test.
Review URL: http://codereview.chromium.org/21329
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/debugger/debugger.scons | 2 | ||||
-rw-r--r-- | chrome/browser/debugger/debugger_shell.cc | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons index 30d1a65..0843376 100644 --- a/chrome/browser/debugger/debugger.scons +++ b/chrome/browser/debugger/debugger.scons @@ -60,6 +60,7 @@ if env.Bit('linux'): # TODO(port): Port these. input_files.Remove( 'debugger_contents.cc', + 'debugger_shell.cc', 'debugger_view.cc', 'debugger_window.cc', ) @@ -70,6 +71,7 @@ if env.Bit('mac'): 'debugger_contents.cc', 'debugger_host_impl.cpp', 'debugger_node.cc', + 'debugger_shell.cc', 'debugger_view.cc', 'debugger_window.cc', ) diff --git a/chrome/browser/debugger/debugger_shell.cc b/chrome/browser/debugger/debugger_shell.cc index 64b4887..21b1c7f 100644 --- a/chrome/browser/debugger/debugger_shell.cc +++ b/chrome/browser/debugger/debugger_shell.cc @@ -4,8 +4,6 @@ #include "chrome/browser/debugger/debugger_shell.h" -#include "build/build_config.h" - #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" @@ -17,15 +15,10 @@ #include "chrome/browser/debugger/debugger_node.h" #include "chrome/browser/debugger/resources/debugger_resources.h" #include "chrome/browser/renderer_host/render_process_host.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/resource_bundle.h" -#if defined(OS_WIN) -#include "chrome/browser/tab_contents/tab_contents.h" -#elif defined(OS_POSIX) -#include "chrome/common/temp_scaffolding_stubs.h" -#endif - DebuggerShell::DebuggerShell(DebuggerInputOutput* io) : io_(io), debugger_ready_(true) { } @@ -416,3 +409,6 @@ v8::Handle<v8::Value> DebuggerShell::CompileAndRun( } return v8::Undefined(); } + + + |