diff options
Diffstat (limited to 'chrome/browser/debugger/debugger_window.cc')
-rw-r--r-- | chrome/browser/debugger/debugger_window.cc | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/chrome/browser/debugger/debugger_window.cc b/chrome/browser/debugger/debugger_window.cc index 4d77dc4..7b3738b 100644 --- a/chrome/browser/debugger/debugger_window.cc +++ b/chrome/browser/debugger/debugger_window.cc @@ -24,20 +24,17 @@ DebuggerWindow::DebuggerWindow() : window_(NULL), DebuggerWindow::~DebuggerWindow() { } -bool DebuggerWindow::DoesDebuggerExist() { +DebuggerHost* DebuggerWindow::GetAnyExistingDebugger() { DebuggerWrapper* wrapper = g_browser_process->debugger_wrapper(); if (!wrapper) - return false; - return wrapper->GetDebugger() != NULL; + return NULL; + return wrapper->GetDebugger(); } void DebuggerWindow::Show(TabContents* tab) { #ifndef CHROME_DEBUGGER_DISABLED - if (window_) { - window_->Show(); - view_->OnShow(); + if (ShowWindow()) return; - } view_ = new DebuggerView(this); window_ = views::Window::CreateChromeWindow(NULL, gfx::Rect(), this); window_->Show(); @@ -137,6 +134,17 @@ void DebuggerWindow::CallFunctionInPage(const std::wstring& name, } } +bool DebuggerWindow::ShowWindow() { +#ifndef CHROME_DEBUGGER_DISABLED + if (window_) { + window_->Show(); + view_->OnShow(); + return true; + } +#endif + return false; +} + /////////////////////////////////////////////////////////////////// // views::WindowDelegate methods |