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

Unified Diff: components/sessions/core/tab_restore_service_helper.cc

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_helper.cc
diff --git a/components/sessions/core/tab_restore_service_helper.cc b/components/sessions/core/tab_restore_service_helper.cc
index 829166c3e2f7304940123c1ca6195ed70ae4d7e6..53318433efeb95691833fdc3d79fe87349d81098 100644
--- a/components/sessions/core/tab_restore_service_helper.cc
+++ b/components/sessions/core/tab_restore_service_helper.cc
@@ -17,7 +17,7 @@
#include "components/sessions/serialized_navigation_entry.h"
#include "components/sessions/session_types.h"
-using sessions::LiveTab;
+namespace sessions {
// TabRestoreServiceHelper::Observer -------------------------------------------
@@ -37,7 +37,7 @@ void TabRestoreServiceHelper::Observer::OnAddEntry() {}
TabRestoreServiceHelper::TabRestoreServiceHelper(
TabRestoreService* tab_restore_service,
Observer* observer,
- sessions::TabRestoreServiceClient* client,
+ TabRestoreServiceClient* client,
TabRestoreService::TimeFactory* time_factory)
: tab_restore_service_(tab_restore_service),
observer_(observer),
@@ -369,9 +369,9 @@ void TabRestoreServiceHelper::PopulateTab(Tab* tab,
entry_count++;
tab->navigations.resize(static_cast<int>(entry_count));
for (int i = 0; i < entry_count; ++i) {
- sessions::SerializedNavigationEntry entry =
- (i == pending_index) ? live_tab->GetPendingEntry()
- : live_tab->GetEntryAtIndex(i);
+ SerializedNavigationEntry entry = (i == pending_index)
+ ? live_tab->GetPendingEntry()
+ : live_tab->GetEntryAtIndex(i);
tab->navigations[i] = entry;
}
tab->timestamp = TimeNow();
@@ -533,3 +533,5 @@ void TabRestoreServiceHelper::UpdateTabBrowserIDs(SessionID::id_type old_id,
base::Time TabRestoreServiceHelper::TimeNow() const {
return time_factory_ ? time_factory_->TimeNow() : base::Time::Now();
}
+
+} // namespace sessions
« no previous file with comments | « components/sessions/core/tab_restore_service_helper.h ('k') | components/sessions/core/tab_restore_service_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698