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

Unified Diff: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h

Issue 2343463003: [Sync] Fix namespaces for the sync_sessions component. (Closed)
Patch Set: Fix gn. Created 4 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/toolbar/recent_tabs_sub_menu_model.h
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
index ca5b0be2132bd56669526f30cf4c13f514f252ce..0c5b74c1196f47f0c2159d9664e3d0889faefdbe 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
@@ -20,10 +20,6 @@
class Browser;
-namespace sync_driver {
-class OpenTabsUIDelegate;
-}
-
namespace favicon_base {
struct FaviconImageResult;
}
@@ -36,6 +32,10 @@ namespace sessions {
struct SessionTab;
}
+namespace sync_sessions {
+class OpenTabsUIDelegate;
+}
+
namespace ui {
class AcceleratorProvider;
}
@@ -60,7 +60,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
// profile will be used. Testing may require a specific |open_tabs_delegate|.
RecentTabsSubMenuModel(ui::AcceleratorProvider* accelerator_provider,
Browser* browser,
- sync_driver::OpenTabsUIDelegate* open_tabs_delegate);
+ sync_sessions::OpenTabsUIDelegate* open_tabs_delegate);
~RecentTabsSubMenuModel() override;
// Overridden from ui::SimpleMenuModel::Delegate:
@@ -110,7 +110,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
// Add the favicon for the device section header.
void AddDeviceFavicon(int index_in_menu,
- sync_driver::SyncedSession::DeviceType device_type);
+ sync_sessions::SyncedSession::DeviceType device_type);
// Add the favicon for a local or other devices' tab asynchronously,
// OnFaviconDataAvailable() will be invoked when the favicon is ready.
@@ -132,7 +132,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
// can always skip going through the function and access the field directly.
// Consider instead having code just deal with potentially NULL open_tabs_
// and have it initialized by an event / callback.
- sync_driver::OpenTabsUIDelegate* GetOpenTabsUIDelegate();
+ sync_sessions::OpenTabsUIDelegate* GetOpenTabsUIDelegate();
// Overridden from TabRestoreServiceObserver:
void TabRestoreServiceChanged(sessions::TabRestoreService* service) override;
@@ -141,7 +141,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
Browser* browser_; // Weak.
- sync_driver::OpenTabsUIDelegate* open_tabs_delegate_; // Weak.
+ sync_sessions::OpenTabsUIDelegate* open_tabs_delegate_; // Weak.
// Accelerator for reopening last closed tab.
ui::Accelerator reopen_closed_tab_accelerator_;
« no previous file with comments | « chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698