diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 23:44:22 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 23:44:22 +0000 |
| commit | 3aa12530b0f3fe0ff15b017cfe8b6e0e76019532 (patch) | |
| tree | c687b33b023937516f87249802e93f37261df9e8 /chrome/browser/browser.h | |
| parent | 0ae49bfd7019599f83f6971a9f1800e54eede6ff (diff) | |
| download | chromium_src-3aa12530b0f3fe0ff15b017cfe8b6e0e76019532.zip chromium_src-3aa12530b0f3fe0ff15b017cfe8b6e0e76019532.tar.gz chromium_src-3aa12530b0f3fe0ff15b017cfe8b6e0e76019532.tar.bz2 | |
Revert "FBTF: Move the TabRestoreService::Observer into its own file."
This reverts commit 4a76b908daffee441d9ebf9fbc74b4015d9145df (r58256) due to
chromeos compile fail.
TBR=akalin
Review URL: http://codereview.chromium.org/3340007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 3637871..e2c9c36 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -14,12 +14,11 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" -#include "base/task.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/browser/sessions/tab_restore_service_observer.h" +#include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/sync/profile_sync_service_observer.h" #include "chrome/browser/tabs/tab_strip_model.h" @@ -51,7 +50,7 @@ class Browser : public TabStripModelDelegate, public CommandUpdater::CommandUpdaterDelegate, public NotificationObserver, public SelectFileDialog::Listener, - public TabRestoreServiceObserver, + public TabRestoreService::Observer, public ProfileSyncServiceObserver { public: // If you change the values in this enum you'll need to update browser_proxy. @@ -620,7 +619,7 @@ class Browser : public TabStripModelDelegate, // Helper function to run unload listeners on a TabContents. static bool RunUnloadEventsHelper(TabContents* contents); - // TabRestoreServiceObserver ///////////////////////////////////////////////// + // TabRestoreService::Observer /////////////////////////////////////////////// virtual void TabRestoreServiceChanged(TabRestoreService* service); virtual void TabRestoreServiceDestroyed(TabRestoreService* service); |