diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-16 01:25:33 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-16 01:25:33 +0000 |
| commit | 3705baeff3bc0c1f63d2376e16c427df18c7564a (patch) | |
| tree | 3d3d20e86ec486dcee95062f09b4677b07dccbd1 /chrome/browser | |
| parent | 83ebe1c3b7527c25da7686d02dbb1761f758ba0d (diff) | |
| download | chromium_src-3705baeff3bc0c1f63d2376e16c427df18c7564a.zip chromium_src-3705baeff3bc0c1f63d2376e16c427df18c7564a.tar.gz chromium_src-3705baeff3bc0c1f63d2376e16c427df18c7564a.tar.bz2 | |
Explicitly include logging.h in a header that assumed it was already getting included.
TBR=nsylvain@google.com
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/debugger/debugger_shell.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/debugger/debugger_shell.h b/chrome/browser/debugger/debugger_shell.h index cafb8bf..acf637e 100644 --- a/chrome/browser/debugger/debugger_shell.h +++ b/chrome/browser/debugger/debugger_shell.h @@ -37,13 +37,16 @@ // If DebuggerWraper doesn't expose the interface you need, extend it to do so. // See comments in debugger_wrapper.h for more details. -#ifndef CHROME_BROWSER_DEBUGGER_DEBUGGER_SHELL_H__ -#define CHROME_BROWSER_DEBUGGER_DEBUGGER_SHELL_H__ +#ifndef CHROME_BROWSER_DEBUGGER_DEBUGGER_SHELL_H_ +#define CHROME_BROWSER_DEBUGGER_DEBUGGER_SHELL_H_ #include "base/basictypes.h" #include "base/ref_counted.h" #ifdef CHROME_DEBUGGER_DISABLED + +#include "base/logging.h" + class DebuggerShell : public base::RefCountedThreadSafe<DebuggerShell> { public: DebuggerShell() { @@ -54,7 +57,9 @@ class DebuggerShell : public base::RefCountedThreadSafe<DebuggerShell> { void DebugMessage(const std::wstring& msg) {} void OnDebugDisconnect() {} }; + #else + #include "debugger_io.h" #include "debugger_node.h" #include "v8/public/v8.h" @@ -146,8 +151,8 @@ class DebuggerShell : public base::RefCountedThreadSafe<DebuggerShell> { // If the debugger is ready to process another command or is busy. bool debugger_ready_; - DISALLOW_EVIL_CONSTRUCTORS(DebuggerShell); + DISALLOW_COPY_AND_ASSIGN(DebuggerShell); }; #endif // else CHROME_DEBUGGER_DISABLED -#endif // CHROME_BROWSER_DEBUGGER_DEBUGGER_SHELL_H__ +#endif // CHROME_BROWSER_DEBUGGER_DEBUGGER_SHELL_H_ |