| Index: chrome/browser/debugger/debugger_window.cc
|
| ===================================================================
|
| --- chrome/browser/debugger/debugger_window.cc (revision 15515)
|
| +++ chrome/browser/debugger/debugger_window.cc (working copy)
|
| @@ -24,20 +24,17 @@
|
| 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 @@
|
| }
|
| }
|
|
|
| +bool DebuggerWindow::ShowWindow() {
|
| +#ifndef CHROME_DEBUGGER_DISABLED
|
| + if (window_) {
|
| + window_->Show();
|
| + view_->OnShow();
|
| + return true;
|
| + }
|
| +#endif
|
| + return false;
|
| +}
|
| +
|
| ///////////////////////////////////////////////////////////////////
|
| // views::WindowDelegate methods
|
|
|
|
|