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

Unified Diff: chrome/browser/ui/views/frame/system_menu_model_delegate.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: chrome/browser/ui/views/frame/system_menu_model_delegate.cc
diff --git a/chrome/browser/ui/views/frame/system_menu_model_delegate.cc b/chrome/browser/ui/views/frame/system_menu_model_delegate.cc
index 131f5a190e03365d01db9d1640846b8412d054bc..12f173bde7acc66b03a293e0d043bfcf89b45f4f 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_delegate.cc
+++ b/chrome/browser/ui/views/frame/system_menu_model_delegate.cc
@@ -48,7 +48,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int command_id) const {
// a good way to dynamically update the menu when TabRestoreService finishes
// loading.
// TODO(sky): add a way to update menu.
- TabRestoreService* trs =
+ sessions::TabRestoreService* trs =
TabRestoreServiceFactory::GetForProfile(browser_->profile());
if (!trs->IsLoaded()) {
trs->LoadTabsFromLastSession();
@@ -72,11 +72,11 @@ base::string16 SystemMenuModelDelegate::GetLabelForCommandId(
int string_id = IDS_RESTORE_TAB;
if (IsCommandIdEnabled(command_id)) {
- TabRestoreService* trs =
+ sessions::TabRestoreService* trs =
TabRestoreServiceFactory::GetForProfile(browser_->profile());
trs->LoadTabsFromLastSession();
if (trs && !trs->entries().empty() &&
- trs->entries().front()->type == TabRestoreService::WINDOW)
+ trs->entries().front()->type == sessions::TabRestoreService::WINDOW)
string_id = IDS_RESTORE_WINDOW;
}
return l10n_util::GetStringUTF16(string_id);
« no previous file with comments | « chrome/browser/ui/views/frame/global_menu_bar_x11.cc ('k') | components/sessions/base_session_service_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698