Decouple TabRestoreService from Browser

chrome/browser/ui/webui/new_tab_ui.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #include "chrome/browser/ui/webui/new_tab_ui.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tab_restore_service_delegate.h"

[sky, 2011/03/14 18:31:25]

You shouldn't need this include, right?

 #include "chrome/browser/ui/webui/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/foreign_session_handler.h"
 #include "chrome/browser/ui/webui/most_visited_handler.h"
 #include "chrome/browser/ui/webui/new_tab_page_sync_handler.h"
 #include "chrome/browser/ui/webui/ntp_login_handler.h"
 #include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/browser/ui/webui/tips_handler.h"
 #include "chrome/browser/ui/webui/value_helper.h"
@@ skipping 69 matching lines @@
   web_ui_->RegisterMessageCallback("reopenTab",
       NewCallback(this, &RecentlyClosedTabsHandler::HandleReopenTab));
 }
 
 RecentlyClosedTabsHandler::~RecentlyClosedTabsHandler() {
   if (tab_restore_service_)
     tab_restore_service_->RemoveObserver(this);
 }
 
 void RecentlyClosedTabsHandler::HandleReopenTab(const ListValue* args) {
-  Browser* browser = Browser::GetBrowserForController(
+  TabRestoreServiceDelegate* delegate =
+      TabRestoreServiceDelegate::FindDelegateForController(
       &web_ui_->tab_contents()->controller(), NULL);
-  if (!browser)
+  if (!delegate)
     return;
 
   int session_to_restore;
   if (ExtractIntegerValue(args, &session_to_restore))
-    tab_restore_service_->RestoreEntryById(browser, session_to_restore, true);
+    tab_restore_service_->RestoreEntryById(delegate, session_to_restore, true);
   // The current tab has been nuked at this point; don't touch any member
   // variables.
 }
 
 void RecentlyClosedTabsHandler::HandleGetRecentlyClosedTabs(
     const ListValue* args) {
   if (!tab_restore_service_) {
     tab_restore_service_ = web_ui_->GetProfile()->GetTabRestoreService();
 
     // GetTabRestoreService() can return NULL (i.e., when in Off the
@@ skipping 460 matching lines @@
   SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
   return "text/html";
 }
 
 bool NewTabUI::NewTabHTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }