Make ManagedMode's GoBackToSafety feature kinda' multi-desktop aware...!

chrome/browser/managed_mode/managed_mode_navigation_observer.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/managed_mode/managed_mode_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_impl.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "grit/generated_resources.h"
@@ skipping 45 matching lines @@
   // For now, just go back one page (the user didn't retreat from that page,
   // so it should be okay).
   content::NavigationController* controller =
       &web_contents->GetController();
   if (controller->CanGoBack()) {
     controller->GoBack();
     return;
   }
 
   // If we can't go back (because we opened a new tab), try to close the tab.
-  // If this is the last tab, open a new window.
-  if (BrowserList::size() == 1) {
-    Browser* browser = *(BrowserList::begin());
+  // If this is the last tab on this desktop, open a new window.
+  chrome::HostDesktopType host_desktop_type =
+      chrome::GetHostDesktopTypeForNativeView(web_contents->GetNativeView());
+  const chrome::BrowserListImpl* browser_list =
+      chrome::BrowserListImpl::GetInstance(host_desktop_type);
+  if (browser_list->size() == 1) {
+    Browser* browser = browser_list->get(0);
     DCHECK(browser == chrome::FindBrowserWithWebContents(web_contents));
     if (browser->tab_strip_model()->count() == 1)
       chrome::NewEmptyWindow(browser->profile());
   }
 
   web_contents->GetDelegate()->CloseContents(web_contents);
 }
 
 // static
 InfoBarDelegate* ManagedModeWarningInfobarDelegate::Create(
@@ skipping 380 matching lines @@
       case NOT_RECORDING_URLS:
         // Check that the infobar is present.
         DCHECK(preview_infobar_delegate_);
         break;
     }
   }
 
   if (behavior == ManagedModeURLFilter::ALLOW)
     last_allowed_page_ = web_contents()->GetController().GetCurrentEntryIndex();
 }