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

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 2905003: Implement support for disabling sync through configuration management. (Closed)
Patch Set: Fix PrefsControllerTest on MAC. Created 10 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 0ed8a0db4562f2ad5788fd6b3449d3c3391455e6..e06cc604b628f1619a7034f37f410d6108a930cd 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -634,8 +634,8 @@ void RecordLastRunAppBundlePath() {
<< "NULL defaultProfile detected -- not doing anything";
break;
}
- enable = ProfileSyncService::IsSyncEnabled() &&
- [self keyWindowIsNotModal];
+ enable = defaultProfile->IsSyncAccessible() &&
+ [self keyWindowIsNotModal];
sync_ui_util::UpdateSyncItem(item, enable, defaultProfile);
break;
}
@@ -848,8 +848,7 @@ void RecordLastRunAppBundlePath() {
menuState_->UpdateCommandEnabled(IDC_HELP_PAGE, true);
menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
menuState_->UpdateCommandEnabled(IDC_REPORT_BUG, true);
- menuState_->UpdateCommandEnabled(IDC_SYNC_BOOKMARKS,
- ProfileSyncService::IsSyncEnabled());
+ menuState_->UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, true);
menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true);
}
« no previous file with comments | « no previous file | chrome/browser/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698