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

Side by Side Diff: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 5 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 // Remove all local tab navigation items. 704 // Remove all local tab navigation items.
705 local_tab_navigation_items_.clear(); 705 local_tab_navigation_items_.clear();
706 706
707 // Remove all local window items. 707 // Remove all local window items.
708 local_window_items_.clear(); 708 local_window_items_.clear();
709 } 709 }
710 710
711 sync_sessions::OpenTabsUIDelegate* 711 sync_sessions::OpenTabsUIDelegate*
712 RecentTabsSubMenuModel::GetOpenTabsUIDelegate() { 712 RecentTabsSubMenuModel::GetOpenTabsUIDelegate() {
713 if (!open_tabs_delegate_) { 713 if (!open_tabs_delegate_) {
714 ProfileSyncService* service = ProfileSyncServiceFactory::GetInstance()-> 714 browser_sync::ProfileSyncService* service =
715 GetForProfile(browser_->profile()); 715 ProfileSyncServiceFactory::GetInstance()->GetForProfile(
716 browser_->profile());
716 // Only return the delegate if it exists and it is done syncing sessions. 717 // Only return the delegate if it exists and it is done syncing sessions.
717 if (service && service->IsSyncActive()) 718 if (service && service->IsSyncActive())
718 open_tabs_delegate_ = service->GetOpenTabsUIDelegate(); 719 open_tabs_delegate_ = service->GetOpenTabsUIDelegate();
719 } 720 }
720 return open_tabs_delegate_; 721 return open_tabs_delegate_;
721 } 722 }
722 723
723 void RecentTabsSubMenuModel::TabRestoreServiceChanged( 724 void RecentTabsSubMenuModel::TabRestoreServiceChanged(
724 sessions::TabRestoreService* service) { 725 sessions::TabRestoreService* service) {
725 ClearLocalEntries(); 726 ClearLocalEntries();
726 727
727 BuildLocalEntries(); 728 BuildLocalEntries();
728 729
729 ui::MenuModelDelegate* menu_model_delegate = GetMenuModelDelegate(); 730 ui::MenuModelDelegate* menu_model_delegate = GetMenuModelDelegate();
730 if (menu_model_delegate) 731 if (menu_model_delegate)
731 menu_model_delegate->OnMenuStructureChanged(); 732 menu_model_delegate->OnMenuStructureChanged();
732 } 733 }
733 734
734 void RecentTabsSubMenuModel::TabRestoreServiceDestroyed( 735 void RecentTabsSubMenuModel::TabRestoreServiceDestroyed(
735 sessions::TabRestoreService* service) { 736 sessions::TabRestoreService* service) {
736 TabRestoreServiceChanged(service); 737 TabRestoreServiceChanged(service);
737 } 738 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698