diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 8abfe46..fa4357a 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -452,16 +452,7 @@ class PrefObserverBridge : public NotificationObserver, [animation_ setAnimationBlockingMode:NSAnimationNonblocking]; // TODO(akalin): handle incognito profiles? - sync_service_ = profile->GetProfileSyncService(); - // TODO(akalin): is this the right place to put this? - if (sync_service_) { - sync_service_->AddObserver(observer_.get()); - } else { - // Disable controls if sync is disabled. - [syncLabel_ setHidden:YES]; - [syncStatus_ setHidden:YES]; - [syncButton_ setHidden:YES]; - } + sync_service_ = profile_->GetProfileSyncService(); } return self; } @@ -591,6 +582,15 @@ class PrefObserverBridge : public NotificationObserver, resizeViewWithoutAutoResizingSubViews:personalStuffView_ delta:NSMakeSize(0.0, verticalShift)]; + if (sync_service_) { + sync_service_->AddObserver(observer_.get()); + } else { + // Disable controls if sync is disabled. + [syncLabel_ setHidden:YES]; + [syncStatus_ setHidden:YES]; + [syncButton_ setHidden:YES]; + } + // Make the window as wide as the views. NSWindow* prefsWindow = [self window]; NSRect frame = [prefsWindow frame]; |