Open tabs in the incognito window with accelerators when it's active.

chrome/browser/ui/views/ash/chrome_shell_delegate.cc

 // Copyright (c) 2012 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/ui/views/ash/chrome_shell_delegate.h"
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/partial_screenshot_view.h"
 #include "ash/wm/window_util.h"
@@ skipping 30 matching lines @@
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #endif
 
+namespace {
+
+// Returns the browser that should handle accelerators.
+Browser* GetTargetBrowser() {
+  Browser* browser = browser::FindBrowserWithWindow(ash::wm::GetActiveWindow());
+  if (browser)
+    return browser;
+  return browser::FindOrCreateTabbedBrowser(
+      ProfileManager::GetDefaultProfileOrOffTheRecord());
+}
+
+}  // namespace
+
 // static
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
 
 ChromeShellDelegate::ChromeShellDelegate()
     : window_positioner_(new WindowPositioner()),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   instance_ = this;
 #if defined(OS_CHROMEOS)
   registrar_.Add(
       this,
@@ skipping 51 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RequestShutdown();
 #endif
 }
 
 void ChromeShellDelegate::Exit() {
   browser::AttemptUserExit();
 }
 
 void ChromeShellDelegate::NewTab() {
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
-      ProfileManager::GetDefaultProfileOrOffTheRecord());
+  Browser* browser = GetTargetBrowser();
   browser->NewTab();
   browser->window()->Show();
 }
 
 void ChromeShellDelegate::NewWindow(bool is_incognito) {
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
   Browser::NewEmptyWindow(
       is_incognito ? profile->GetOffTheRecordProfile() : profile);
 }
 
 void ChromeShellDelegate::OpenFileManager() {
 #if defined(OS_CHROMEOS)
   file_manager_util::OpenApplication();
 #endif
 }
 
 void ChromeShellDelegate::OpenCrosh() {
 #if defined(OS_CHROMEOS)
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
-      ProfileManager::GetDefaultProfileOrOffTheRecord());
+  Browser* browser = GetTargetBrowser();
   GURL crosh_url = TerminalExtensionHelper::GetCroshExtensionURL(
       browser->profile());
   if (!crosh_url.is_valid())
     return;
   browser->OpenURL(
       content::OpenURLParams(crosh_url,
                              content::Referrer(),
                              NEW_FOREGROUND_TAB,
                              content::PAGE_TRANSITION_GENERATED,
                              false));
 #endif
 }
 
 void ChromeShellDelegate::OpenMobileSetup(const std::string& service_path) {
 #if defined(OS_CHROMEOS)
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
-      ProfileManager::GetDefaultProfileOrOffTheRecord());
+  Browser* browser = GetTargetBrowser();
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableMobileSetupDialog)) {
     MobileSetupDialog::Show(service_path);
   } else {
     std::string url(chrome::kChromeUIMobileSetupURL);
     url.append(service_path);
     browser->OpenURL(
         content::OpenURLParams(GURL(url),
                                content::Referrer(),
                                NEW_FOREGROUND_TAB,
                                content::PAGE_TRANSITION_LINK,
                                false));
     browser->window()->Activate();
   }
 #endif
 }
 
 void ChromeShellDelegate::RestoreTab() {
-  Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
+  Browser* browser = GetTargetBrowser();
+  // Do not restore tabs while in the incognito mode.
+  if (browser->profile()->IsOffTheRecord())
+    return;
   TabRestoreService* service =
-      TabRestoreServiceFactory::GetForProfile(profile);
+      TabRestoreServiceFactory::GetForProfile(browser->profile());
   if (!service)
     return;
   if (service->IsLoaded()) {
-    Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
     browser->RestoreTab();
   } else {
     service->LoadTabsFromLastSession();
     // LoadTabsFromLastSession is asynchronous, so TabRestoreService has not
     // finished loading the entries at this point. Wait for next event cycle
     // which loads the restored tab entries.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ChromeShellDelegate::RestoreTab,
                    weak_factory_.GetWeakPtr()));
@@ skipping 77 matching lines @@
       ash::Shell::GetInstance()->CreateLauncher();
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 #else
   // MSVC++ warns about switch statements without any cases.
   NOTREACHED() << "Unexpected notification " << type;
 #endif
 }