[Mac] Website settings: Fix DCHECK that was checking the wrong condition.
The intention of the DCHECK was to ensure that the permissions view is always laid out before the cookies view. The correct place to do this check is when laying out the cookies view. BUG= Review URL: https://chromiumcodereview.appspot.com/11567040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173464 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
@@ -1090,6 +1090,11 @@ NSColor* IdentityVerifiedTextColor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)setCookieInfo:(const CookieInfoList&)cookieInfoList {
|
- (void)setCookieInfo:(const CookieInfoList&)cookieInfoList {
|
||||||
|
// The contents of the permissions view can cause the whole window to get
|
||||||
|
// bigger, but currently permissions are always set before cookie info.
|
||||||
|
// Check to make sure that's still the case.
|
||||||
|
DCHECK_GT([[permissionsView_ subviews] count], 0U);
|
||||||
|
|
||||||
[cookiesView_ setSubviews:[NSArray array]];
|
[cookiesView_ setSubviews:[NSArray array]];
|
||||||
NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
|
NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
|
||||||
|
|
||||||
@@ -1120,11 +1125,6 @@ NSColor* IdentityVerifiedTextColor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList {
|
- (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList {
|
||||||
// The contents of the permissions view can cause the whole window to get
|
|
||||||
// bigger, but currently permissions are always set before cookie info.
|
|
||||||
// Check to make sure that's still the case.
|
|
||||||
DCHECK_EQ(0U, [[cookiesView_ subviews] count]);
|
|
||||||
|
|
||||||
[permissionsView_ setSubviews:[NSArray array]];
|
[permissionsView_ setSubviews:[NSArray array]];
|
||||||
NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
|
NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user