diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 07:45:59 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 07:45:59 +0000 |
| commit | d3b98c88fa50c3b6bf4644570220cf93f8ca9bea (patch) | |
| tree | e2fdf54cee2d8546526ed9aca724e9f957d0fb2b /chrome/browser/app_controller_mac.mm | |
| parent | 9473a8d2db6780ecac153c65ba8200cdb0eeb1bd (diff) | |
| download | chromium_src-d3b98c88fa50c3b6bf4644570220cf93f8ca9bea.zip chromium_src-d3b98c88fa50c3b6bf4644570220cf93f8ca9bea.tar.gz chromium_src-d3b98c88fa50c3b6bf4644570220cf93f8ca9bea.tar.bz2 | |
Implement support for disabling sync through configuration management.
BUG=45316
TEST=Configure SyncDisabled policy and check the UI.
Review URL: http://codereview.chromium.org/2905003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 0ed8a0d..e06cc60 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); } |