summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 20:59:34 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 20:59:34 +0000
commit484c03e6fc8a9ae2086f059aa8995c680bf16848 (patch)
treed8450ada59084a76f16d22378e2e7eb5f0fbd79e /chrome/browser
parent07cdb514c6e6279278658f6bc89025fa57f395ab (diff)
downloadchromium_src-484c03e6fc8a9ae2086f059aa8995c680bf16848.zip
chromium_src-484c03e6fc8a9ae2086f059aa8995c680bf16848.tar.gz
chromium_src-484c03e6fc8a9ae2086f059aa8995c680bf16848.tar.bz2
Moved pref stuff to the right place.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm20
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];