Enabled Ctrl+Shift+L for POPUP and APP windows....

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
+#include "chrome/browser/debugger/debugger_host.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
@@ skipping 1009 matching lines @@
   UserMetrics::RecordAction(L"CreateShortcut", profile_);
   GetSelectedTabContents()->CreateShortcut();
 }
 
 void Browser::OpenDebuggerWindow() {
 #ifndef CHROME_DEBUGGER_DISABLED
   UserMetrics::RecordAction(L"Debugger", profile_);
   // Only one debugger instance can exist at a time right now.
   // TODO(erikkay): need an alert, dialog, something
   // or better yet, fix the one instance limitation
-  if (!DebuggerWindow::DoesDebuggerExist())
-    debugger_window_ = new DebuggerWindow();
+  DebuggerHost* host = DebuggerWindow::GetAnyExistingDebugger();
+  if (host) {
+    host->ShowWindow();
+    return;
+  }
+  debugger_window_ = new DebuggerWindow();
   debugger_window_->Show(GetSelectedTabContents());
 #endif
 }
 
 void Browser::OpenJavaScriptConsole() {
   UserMetrics::RecordAction(L"ShowJSConsole", profile_);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOutOfProcessDevTools)) {
     DevToolsManager* manager = g_browser_process->devtools_manager();
     manager->OpenDevToolsWindow(GetSelectedTabContents());
@@ skipping 1048 matching lines @@
 
   // Clipboard commands
   command_updater_.UpdateCommandEnabled(IDC_CUT, true);
   command_updater_.UpdateCommandEnabled(IDC_COPY, true);
   command_updater_.UpdateCommandEnabled(IDC_COPY_URL, true);
   command_updater_.UpdateCommandEnabled(IDC_PASTE, true);
 
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true);
   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
+#if defined(OS_WIN)
+  // Command line debugger conflicts with the new oop one.
+  bool oop_devtools = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableOutOfProcessDevTools);
+  command_updater_.UpdateCommandEnabled(IDC_DEBUGGER,
+      // The debugger doesn't work in single process mode.
+      !oop_devtools && !RenderProcessHost::run_renderer_in_process());
+#endif
   command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
 
   // Initialize other commands based on the window type.
   {
     bool normal_window = type() == TYPE_NORMAL;
@@ skipping 11 matching lines @@
     command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
     command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB,
         normal_window && !profile_->IsOffTheRecord());
 
     // Show various bits of UI
-#if defined(OS_WIN)
-    // Command line debugger conflicts with the new oop one.
-    bool oop_devtools = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableOutOfProcessDevTools);
-    command_updater_.UpdateCommandEnabled(IDC_DEBUGGER,
-        // The debugger doesn't work in single process mode.
-        !oop_devtools && normal_window &&
-            !RenderProcessHost::run_renderer_in_process());
-#endif
     command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
                                           normal_window);
   }
 
   // Initialize other commands whose state changes based on fullscreen mode.
   UpdateCommandsForFullscreenMode(false);
 }
 
 void Browser::UpdateCommandsForTabState() {
   TabContents* current_tab = GetSelectedTabContents();
@@ skipping 454 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }