Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Unified Diff: chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

Issue 11567040: [Mac] Website settings: Fix DCHECK that was checking the wrong condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
index ee9d575a15fca276cbf899a9d43178925d621977..37a831cbd9f67dc3ded9b64905253e66ce477bf7 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
@@ -1090,6 +1090,11 @@ NSColor* IdentityVerifiedTextColor() {
}
- (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]];
NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
@@ -1120,11 +1125,6 @@ NSColor* IdentityVerifiedTextColor() {
}
- (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]];
NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698