Index: components/sessions/core/persistent_tab_restore_service.h |
diff --git a/components/sessions/core/persistent_tab_restore_service.h b/components/sessions/core/persistent_tab_restore_service.h |
index f87dcf46f7c9dd35fe868fb513ae2ea2340ae30d..81be345e42bd23630f6376878d391d53a6443c50 100644 |
--- a/components/sessions/core/persistent_tab_restore_service.h |
+++ b/components/sessions/core/persistent_tab_restore_service.h |
@@ -15,29 +15,32 @@ |
#include "components/sessions/core/tab_restore_service_helper.h" |
#include "components/sessions/sessions_export.h" |
+class PersistentTabRestoreServiceTest; |
+ |
+namespace sessions { |
+ |
// Tab restore service that persists data on disk. |
class SESSIONS_EXPORT PersistentTabRestoreService : public TabRestoreService { |
public: |
// Does not take ownership of |time_factory|. |
- PersistentTabRestoreService( |
- scoped_ptr<sessions::TabRestoreServiceClient> client, |
- TimeFactory* time_factory); |
+ PersistentTabRestoreService(scoped_ptr<TabRestoreServiceClient> client, |
+ TimeFactory* time_factory); |
~PersistentTabRestoreService() override; |
// TabRestoreService: |
void AddObserver(TabRestoreServiceObserver* observer) override; |
void RemoveObserver(TabRestoreServiceObserver* observer) override; |
- void CreateHistoricalTab(sessions::LiveTab* live_tab, int index) override; |
+ void CreateHistoricalTab(LiveTab* live_tab, int index) override; |
void BrowserClosing(TabRestoreServiceDelegate* delegate) override; |
void BrowserClosed(TabRestoreServiceDelegate* delegate) override; |
void ClearEntries() override; |
const Entries& entries() const override; |
- std::vector<sessions::LiveTab*> RestoreMostRecentEntry( |
+ std::vector<LiveTab*> RestoreMostRecentEntry( |
TabRestoreServiceDelegate* delegate, |
int host_desktop_type) override; |
Tab* RemoveTabEntryById(SessionID::id_type id) override; |
- std::vector<sessions::LiveTab*> RestoreEntryById( |
+ std::vector<LiveTab*> RestoreEntryById( |
TabRestoreServiceDelegate* delegate, |
SessionID::id_type id, |
int host_desktop_type, |
@@ -48,7 +51,7 @@ class SESSIONS_EXPORT PersistentTabRestoreService : public TabRestoreService { |
void Shutdown() override; |
private: |
- friend class PersistentTabRestoreServiceTest; |
+ friend class ::PersistentTabRestoreServiceTest; |
class Delegate; |
@@ -56,11 +59,13 @@ class SESSIONS_EXPORT PersistentTabRestoreService : public TabRestoreService { |
Entries* mutable_entries(); |
void PruneEntries(); |
- scoped_ptr<sessions::TabRestoreServiceClient> client_; |
+ scoped_ptr<TabRestoreServiceClient> client_; |
scoped_ptr<Delegate> delegate_; |
TabRestoreServiceHelper helper_; |
DISALLOW_COPY_AND_ASSIGN(PersistentTabRestoreService); |
}; |
+} // namespace sessions |
+ |
#endif // COMPONENTS_SESSIONS_CORE_PERSISTENT_TAB_RESTORE_SERVICE_H_ |