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

Unified Diff: components/sessions/core/tab_restore_service.h

Issue 1350653004: [sessions] Properly namespace recently-componentized TabRestore code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac Created 5 years, 3 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
Index: components/sessions/core/tab_restore_service.h
diff --git a/components/sessions/core/tab_restore_service.h b/components/sessions/core/tab_restore_service.h
index b7a67d234707c34aa23961a1b1b738b9fc92a01e..d28e81104f74ac1020872151a525bfbcd4ede371 100644
--- a/components/sessions/core/tab_restore_service.h
+++ b/components/sessions/core/tab_restore_service.h
@@ -19,12 +19,11 @@
#include "components/sessions/sessions_export.h"
#include "ui/base/window_open_disposition.h"
-class TabRestoreServiceDelegate;
-class TabRestoreServiceObserver;
-
namespace sessions {
+
class LiveTab;
-}
+class TabRestoreServiceDelegate;
+class TabRestoreServiceObserver;
// TabRestoreService is responsible for maintaining the most recently closed
// tabs and windows. When a tab is closed
@@ -84,7 +83,7 @@ class SESSIONS_EXPORT TabRestoreService : public KeyedService {
bool has_browser() const { return browser_id > 0; }
// The navigations.
- std::vector<sessions::SerializedNavigationEntry> navigations;
+ std::vector<SerializedNavigationEntry> navigations;
// Index of the selected navigation in navigations.
int current_navigation_index;
@@ -103,7 +102,7 @@ class SESSIONS_EXPORT TabRestoreService : public KeyedService {
std::string extension_app_id;
// The associated client data.
- scoped_ptr<sessions::TabClientData> client_data;
+ scoped_ptr<TabClientData> client_data;
// The user agent override used for the tab's navigations (if applicable).
std::string user_agent_override;
@@ -135,7 +134,7 @@ class SESSIONS_EXPORT TabRestoreService : public KeyedService {
// Creates a Tab to represent |live_tab| and notifies observers the list of
// entries has changed.
- virtual void CreateHistoricalTab(sessions::LiveTab* live_tab, int index) = 0;
+ virtual void CreateHistoricalTab(LiveTab* live_tab, int index) = 0;
// Invoked when a browser is closing. If |delegate| is a tabbed browser with
// at least one tab, a Window is created, added to entries and observers are
@@ -159,7 +158,7 @@ class SESSIONS_EXPORT TabRestoreService : public KeyedService {
// class and will be used only to pass back to the embedder via
// TabRestoreServiceClient if necessary. Returns the LiveTab instances of the
// restored tab(s).
- virtual std::vector<sessions::LiveTab*> RestoreMostRecentEntry(
+ virtual std::vector<LiveTab*> RestoreMostRecentEntry(
TabRestoreServiceDelegate* delegate,
int host_desktop_type) = 0;
@@ -175,7 +174,7 @@ class SESSIONS_EXPORT TabRestoreService : public KeyedService {
// this class and will be used only to pass back to the embedder via
// TabRestoreServiceClient if necessary. Returns the LiveTab instances of the
// restored tab(s).
- virtual std::vector<sessions::LiveTab*> RestoreEntryById(
+ virtual std::vector<LiveTab*> RestoreEntryById(
TabRestoreServiceDelegate* delegate,
SessionID::id_type id,
int host_desktop_type,
@@ -192,4 +191,6 @@ class SESSIONS_EXPORT TabRestoreService : public KeyedService {
virtual void DeleteLastSession() = 0;
};
+} // namespace sessions
+
#endif // COMPONENTS_SESSIONS_CORE_TAB_RESTORE_SERVICE_H_
« no previous file with comments | « components/sessions/core/serialized_navigation_driver.h ('k') | components/sessions/core/tab_restore_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698