Index: chrome/browser/ui/views/frame/global_menu_bar_x11.cc |
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc |
index a19b2c3aba8f64d1b7c0c390bdb482a92e3ddea5..46169cb5f6d1fbc673565da4541f03ea4d73c3f6 100644 |
--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc |
+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc |
@@ -18,6 +18,7 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/history/top_sites.h" |
+#include "chrome/browser/history/top_sites_factory.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_info_cache.h" |
#include "chrome/browser/profiles/profile_manager.h" |
@@ -426,14 +427,14 @@ void GlobalMenuBarX11::InitServer(unsigned long xid) { |
base::Unretained(this))); |
OnBookmarkBarVisibilityChanged(); |
- top_sites_ = profile_->GetTopSites(); |
+ top_sites_ = TopSitesFactory::GetForProfile(profile_); |
if (top_sites_) { |
GetTopSitesData(); |
// Register for notification when TopSites changes so that we can update |
// ourself. |
registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED, |
sdefresne
2015/01/21 17:57:23
This code has changed upstream, please fetch, reba
|
- content::Source<history::TopSites>(top_sites_)); |
+ content::Source<history::TopSites>(top_sites_.get())); |
} |
ProfileManager* profile_manager = g_browser_process->profile_manager(); |