RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/ui/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 33 matching lines @@
 class OffscreenTabContentsCreator;
 class OldBasePanelBrowserTest;
 class OmniboxSearchHint;
 class PanelHost;
 class PasswordManager;
 class PasswordManagerDelegate;
 class PDFTabObserver;
 class PluginObserver;
 class PrefsTabHelper;
 class Profile;
-class RestoreTabHelper;
 class SadTabHelper;
 class SearchEngineTabHelper;
+class SessionTabHelper;
 class ShellWindow;
 class SnapshotTabHelper;
 class TabContentsSSLHelper;
 class TabContentsTestHarness;
 class TabSpecificContentSettings;
 class TabStripModel;
 class TabStripModelContentsCreator;
 class ThumbnailGenerator;
 class TranslateTabHelper;
 class TranslationInfoBarTestContentsCreator;
@@ skipping 201 matching lines @@
   PrefsTabHelper* prefs_tab_helper() { return prefs_tab_helper_.get(); }
 
   prerender::PrerenderTabHelper* prerender_tab_helper() {
     return prerender_tab_helper_.get();
   }
 
   printing::PrintViewManager* print_view_manager() {
     return print_view_manager_.get();
   }
 
-  RestoreTabHelper* restore_tab_helper() {
-    return restore_tab_helper_.get();
-  }
-
-  const RestoreTabHelper* restore_tab_helper() const {
-    return restore_tab_helper_.get();
-  }
-
   SadTabHelper* sad_tab_helper() { return sad_tab_helper_.get(); }
 
   SearchEngineTabHelper* search_engine_tab_helper() {
     return search_engine_tab_helper_.get();
   }
 
   chrome::search::SearchTabHelper* search_tab_helper() {
     return search_tab_helper_.get();
   }
 
+  SessionTabHelper* session_tab_helper() {
+    return session_tab_helper_.get();
+  }
+
+  const SessionTabHelper* session_tab_helper() const {
+    return session_tab_helper_.get();
+  }
+
   SnapshotTabHelper* snapshot_tab_helper() {
     return snapshot_tab_helper_.get();
   }
 
   TabContentsSSLHelper* ssl_helper() { return ssl_helper_.get(); }
 
   browser_sync::SyncedTabDelegate* synced_tab_delegate() {
     return synced_tab_delegate_.get();
   }
 
@@ skipping 15 matching lines @@
   }
 
   ZoomController* zoom_controller() {
     return zoom_controller_.get();
   }
 
   // Overrides -----------------------------------------------------------------
 
   // content::WebContentsObserver overrides:
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
-  virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE;
 
  private:
   friend class TabContentsFactory;
 
   // Takes ownership of |contents|, which must be heap-allocated (as it lives
   // in a scoped_ptr) and can not be NULL.
   explicit TabContents(content::WebContents* contents);
 
   // Create a TabContents with the same state as this one. The returned
   // heap-allocated pointer is owned by the caller.
@@ skipping 28 matching lines @@
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
 
   scoped_ptr<PrefsTabHelper> prefs_tab_helper_;
   scoped_ptr<prerender::PrerenderTabHelper> prerender_tab_helper_;
 
   // Handles print job for this contents.
   scoped_ptr<printing::PrintViewManager> print_view_manager_;
 
-  scoped_ptr<RestoreTabHelper> restore_tab_helper_;
   scoped_ptr<SadTabHelper> sad_tab_helper_;
   scoped_ptr<SearchEngineTabHelper> search_engine_tab_helper_;
   scoped_ptr<chrome::search::SearchTabHelper> search_tab_helper_;
+  scoped_ptr<SessionTabHelper> session_tab_helper_;
   scoped_ptr<SnapshotTabHelper> snapshot_tab_helper_;
   scoped_ptr<TabContentsSSLHelper> ssl_helper_;
   scoped_ptr<browser_sync::SyncedTabDelegate> synced_tab_delegate_;
 
   // The TabSpecificContentSettings object is used to query the blocked content
   // state by various UI elements.
   scoped_ptr<TabSpecificContentSettings> content_settings_;
 
   scoped_ptr<ThumbnailGenerator> thumbnail_generator_;
   scoped_ptr<TranslateTabHelper> translate_tab_helper_;
@@ skipping 28 matching lines @@
 
   // The supporting objects need to outlive the WebContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<content::WebContents> web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_