Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(749)

Unified Diff: chrome/browser/ui/browser.h

Issue 6660028: Decouple TabRestoreService from Browser (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix mac build and handle NULL in delegate statics Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/tab_restore_service_delegate.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 8427344163191a1a50e807411b30a24b11402560..dbd65ff1f7cb807a4b65210978f4b8daf122d5c7 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -40,6 +40,7 @@
#include "content/common/notification_registrar.h"
#include "ui/gfx/rect.h"
+class BrowserTabRestoreServiceDelegate;
class BrowserWindow;
class Extension;
class FindBarController;
@@ -201,6 +202,9 @@ class Browser : public TabHandlerDelegate,
const SessionID& session_id() const { return session_id_; }
CommandUpdater* command_updater() { return &command_updater_; }
bool block_command_execution() const { return block_command_execution_; }
+ BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() {
+ return tab_restore_service_delegate_.get();
+ }
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
@@ -348,6 +352,7 @@ class Browser : public TabHandlerDelegate,
TabContents* GetSelectedTabContents() const;
TabContents* GetTabContentsAt(int index) const;
void SelectTabContentsAt(int index, bool user_gesture);
+ bool IsTabPinned(int index) const;
void CloseAllTabs();
// Tab adding/showing functions /////////////////////////////////////////////
@@ -1151,6 +1156,9 @@ class Browser : public TabHandlerDelegate,
// and we install ourselves as an observer.
TabRestoreService* tab_restore_service_;
+ // Helper which implements the TabRestoreServiceDelegate interface.
+ scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
+
scoped_ptr<InstantController> instant_;
scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
« no previous file with comments | « chrome/browser/sessions/tab_restore_service_delegate.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698