diff options
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r-- | chrome/browser/debugger/debugger_contents.cc | 2 | ||||
-rw-r--r-- | chrome/browser/debugger/debugger_host.h | 2 | ||||
-rw-r--r-- | chrome/browser/debugger/debugger_host_impl.cpp | 6 | ||||
-rw-r--r-- | chrome/browser/debugger/debugger_io.h | 2 | ||||
-rw-r--r-- | chrome/browser/debugger/debugger_window.cc | 2 | ||||
-rw-r--r-- | chrome/browser/debugger/debugger_window.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/debugger/debugger_contents.cc b/chrome/browser/debugger/debugger_contents.cc index 386b5d8..5927caa 100644 --- a/chrome/browser/debugger/debugger_contents.cc +++ b/chrome/browser/debugger/debugger_contents.cc @@ -137,7 +137,7 @@ void DebuggerContents::Init() { // static bool DebuggerContents::IsDebuggerUrl(const GURL& url) { - return (url.SchemeIs(DOMUIContents::GetScheme().c_str()) && + return (url.SchemeIs(DOMUIContents::GetScheme().c_str()) && url.host() == kDebuggerHost); } diff --git a/chrome/browser/debugger/debugger_host.h b/chrome/browser/debugger/debugger_host.h index bfb2efa..c008c30 100644 --- a/chrome/browser/debugger/debugger_host.h +++ b/chrome/browser/debugger/debugger_host.h @@ -27,7 +27,7 @@ class DebuggerHost : public base::RefCountedThreadSafe<DebuggerHost> { virtual void OnDebugAttach() = 0; // The renderer we're attached to is gone. virtual void OnDebugDisconnect() = 0; - + virtual void DidDisconnect() = 0; virtual void DidConnect() {} virtual void ProcessCommand(const std::wstring& data) {} diff --git a/chrome/browser/debugger/debugger_host_impl.cpp b/chrome/browser/debugger/debugger_host_impl.cpp index beeb398..83795d8 100644 --- a/chrome/browser/debugger/debugger_host_impl.cpp +++ b/chrome/browser/debugger/debugger_host_impl.cpp @@ -66,7 +66,7 @@ class TabContentsReference : public NotificationObserver { DebuggerHostImpl::DebuggerHostImpl(DebuggerInputOutput* io) - : io_(io), + : io_(io), debugger_ready_(true) { } @@ -75,8 +75,8 @@ DebuggerHostImpl::~DebuggerHostImpl() { io_ = NULL; } -void DebuggerHostImpl::Start() { - io_->Start(this); +void DebuggerHostImpl::Start() { + io_->Start(this); } void DebuggerHostImpl::Debug(TabContents* tab) { diff --git a/chrome/browser/debugger/debugger_io.h b/chrome/browser/debugger/debugger_io.h index b2ea381..68b04e6 100644 --- a/chrome/browser/debugger/debugger_io.h +++ b/chrome/browser/debugger/debugger_io.h @@ -42,7 +42,7 @@ public: virtual void SetDebuggerBreak(bool brk) {} // sends message to debugger UI page in order to invoke JS function in it - virtual void CallFunctionInPage(const std::wstring& name, + virtual void CallFunctionInPage(const std::wstring& name, ListValue* argv) {} protected: diff --git a/chrome/browser/debugger/debugger_window.cc b/chrome/browser/debugger/debugger_window.cc index 1f62d01..aae04e6 100644 --- a/chrome/browser/debugger/debugger_window.cc +++ b/chrome/browser/debugger/debugger_window.cc @@ -126,7 +126,7 @@ void DebuggerWindow::SetDebuggerBreak(bool brk) { #endif } -void DebuggerWindow::CallFunctionInPage(const std::wstring& name, +void DebuggerWindow::CallFunctionInPage(const std::wstring& name, ListValue* argv) { if (view_) { DictionaryValue* body = new DictionaryValue; diff --git a/chrome/browser/debugger/debugger_window.h b/chrome/browser/debugger/debugger_window.h index 4b980f3..85f4ff8 100644 --- a/chrome/browser/debugger/debugger_window.h +++ b/chrome/browser/debugger/debugger_window.h @@ -37,7 +37,7 @@ class DebuggerWindow : public DebuggerInputOutput, virtual void SetDebuggerBreak(bool brk); // Note that this method will take ownership of argv. - virtual void CallFunctionInPage(const std::wstring& name, + virtual void CallFunctionInPage(const std::wstring& name, ListValue* argv); // views::WindowDelegate methods: |