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

Unified Diff: chrome/browser/ui/webui/browsing_history_handler.h

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Self-review. 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/webui/browsing_history_handler.h
diff --git a/chrome/browser/ui/webui/browsing_history_handler.h b/chrome/browser/ui/webui/browsing_history_handler.h
index 5e6924989571e793398a72f5faecd83e067a9e5b..00b627841abefaedb557ee802474fd64230b0b70 100644
--- a/chrome/browser/ui/webui/browsing_history_handler.h
+++ b/chrome/browser/ui/webui/browsing_history_handler.h
@@ -25,13 +25,16 @@
#include "content/public/browser/web_ui_message_handler.h"
#include "url/gurl.h"
-class ProfileSyncService;
class SupervisedUserService;
namespace bookmarks {
class BookmarkModel;
}
skym 2016/09/22 17:25:59 Closing namespaces.
maxbogue 2016/09/22 19:41:15 Done.
+namespace browser_sync {
+class ProfileSyncService;
+}
+
namespace history {
class HistoryService;
struct QueryOptions;
@@ -77,7 +80,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler,
std::unique_ptr<base::DictionaryValue> ToValue(
bookmarks::BookmarkModel* bookmark_model,
SupervisedUserService* supervised_user_service,
- const ProfileSyncService* sync_service,
+ const browser_sync::ProfileSyncService* sync_service,
bool limit_title_length) const;
// Comparison function for sorting HistoryEntries from newest to oldest.
@@ -244,7 +247,8 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler,
web_history_service_observer_;
// ProfileSyncService observer listens to late initialization of history sync.
- ScopedObserver<ProfileSyncService, sync_driver::SyncServiceObserver>
+ ScopedObserver<browser_sync::ProfileSyncService,
+ sync_driver::SyncServiceObserver>
sync_service_observer_;
// Whether the last call to Web History returned synced results.

Powered by Google App Engine
This is Rietveld 408576698