[Mac] Website settings: Add cookie info & permission icons, plus other visual fixes.

chrome/browser/ui/cocoa/website_settings_bubble_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 
 class TabContents;
 class WebsiteSettingsUIBridge;
 
 // This NSWindowController subclass manages the InfoBubbleWindow and view that
 // are displayed when the user clicks the favicon or security lock icon.
 @interface WebsiteSettingsBubbleController : BaseBubbleController {
  @private
   scoped_nsobject<NSView> contentView_;
   scoped_nsobject<NSSegmentedControl> segmentedControl_;
   scoped_nsobject<NSTabView> tabView_;
 
   // Displays the web site identity.
   NSTextField* identityField_;
 
   // Display the identity status (e.g. verified, not verified).
   NSTextField* identityStatusField_;
 
-  NSView* permissionsContentView_;
+  // The main content view for the Permissions tab.
+  NSView* permissionsTabContentView_;
+
+  // Container for cookies info on the Permissions tab.
+  NSView* cookiesView_;
+
+  // Container for permission info on the Permissions tab.
+  NSView* permissionsView_;
 
   NSImageView* identityStatusIcon_;
   NSTextField* identityStatusDescriptionField_;
   NSView* separatorAfterIdentity_;
 
   NSImageView* connectionStatusIcon_;
   NSTextField* connectionStatusDescriptionField_;
   NSView* separatorAfterConnection_;
 
   NSImageView* firstVisitIcon_;
   NSTextField* firstVisitHeaderField_;
   NSTextField* firstVisitDescriptionField_;
 
-  CGFloat permissionsTabHeight_;
-
   // The UI translates user actions to specific events and forwards them to the
   // |presenter_|. The |presenter_| handles these events and updates the UI.
   scoped_ptr<WebsiteSettings> presenter_;
 
   // Bridge which implements the WebsiteSettingsUI interface and forwards
   // methods on to this class.
   scoped_ptr<WebsiteSettingsUIBridge> bridge_;
 }
 
 // Designated initializer. The controller will release itself when the bubble
@@ skipping 32 matching lines @@
       const PermissionInfoList& permission_info_list) OVERRIDE;
   virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
   virtual void SetFirstVisit(const string16& first_visit) OVERRIDE;
 
  private:
   // The Cocoa controller for the bubble UI.
   WebsiteSettingsBubbleController* bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsUIBridge);
 };