summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 20:59:51 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 20:59:51 +0000
commit3eebe5de65edfcf40efffac399fd6083db4b55f7 (patch)
treebf3a79993bdc4dc313d1ed1bfe6e443f7681eb8b /chrome
parent6d12e9742b5bb968594e9f5c167d7707ecbb64cf (diff)
downloadchromium_src-3eebe5de65edfcf40efffac399fd6083db4b55f7.zip
chromium_src-3eebe5de65edfcf40efffac399fd6083db4b55f7.tar.gz
chromium_src-3eebe5de65edfcf40efffac399fd6083db4b55f7.tar.bz2
Added vertical shift for sync stuff.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 21721ede..ba1f51f 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -564,6 +564,9 @@ class PrefObserverBridge : public NotificationObserver,
delta:NSMakeSize(0.0, verticalShift)];
verticalShift = 0.0;
+ verticalShift += AutoSizeGroup(personalStuffGroupSync_,
+ kAutoSizeGroupBehaviorVerticalToFit,
+ verticalShift);
verticalShift += AutoSizeGroup(personalStuffGroupThemes_,
kAutoSizeGroupBehaviorHorizontalToFit,
verticalShift);
@@ -582,6 +585,7 @@ class PrefObserverBridge : public NotificationObserver,
if (sync_service_) {
sync_service_->AddObserver(observer_.get());
+ [self syncStateChanged];
} else {
// Disable controls if sync is disabled.
RemoveViewFromView(personalStuffView_, syncLabel_);
@@ -636,11 +640,6 @@ class PrefObserverBridge : public NotificationObserver,
// TODO(pinkerton): save/restore position based on prefs.
[[self window] center];
-
- // Get initial sync state.
- if (sync_service_) {
- [self syncStateChanged];
- }
}
- (void)dealloc {