Index: chrome/browser/history/chrome_history_client.h |
diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h |
index e0482d7a388413e5fda4ff479c80af21eed00965..3e16a6f6398fec59571475b9bde4f7512f6d946a 100644 |
--- a/chrome/browser/history/chrome_history_client.h |
+++ b/chrome/browser/history/chrome_history_client.h |
@@ -6,8 +6,8 @@ |
#define CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_ |
#include "base/macros.h" |
+#include "chrome/browser/history/history_service.h" |
#include "components/history/core/browser/history_client.h" |
-#include "components/history/core/browser/history_service_observer.h" |
#include "components/history/core/browser/top_sites_observer.h" |
class BookmarkModel; |
@@ -21,8 +21,8 @@ class TopSites; |
// This class implements history::HistoryClient to abstract operations that |
// depend on Chrome environment. |
class ChromeHistoryClient : public history::HistoryClient, |
- public history::HistoryServiceObserver, |
- public history::TopSitesObserver { |
+ public history::TopSitesObserver, |
+ public HistoryService::Observer { |
public: |
explicit ChromeHistoryClient(BookmarkModel* bookmark_model, |
Profile* profile, |
@@ -45,7 +45,7 @@ class ChromeHistoryClient : public history::HistoryClient, |
// KeyedService: |
virtual void Shutdown() OVERRIDE; |
- // HistoryServiceObserver: |
+ // HistoryService::Observer: |
virtual void OnURLVisited(ui::PageTransition transition, |
const history::URLRow& row, |
const history::RedirectList& redirects, |