From 9e4683cd3808c3ad9cb1233ecc2e647e9772c0f6 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Tue, 9 Feb 2010 21:04:28 +0000 Subject: [Mac] Add local storage nodes to the cookie manager * Add local storage getters to CookieTreeNode * XIB: Embed cookie info labels into an NSView (inside the NSBox) and add another for info NSView for local storage. * Roll GTM r280:293 BUG=33068 TEST=Chromium-->Preferences-->Under the Hood-->Show cookies... Find and click on a local storage node. Info should be displayed. Review URL: http://codereview.chromium.org/599003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38504 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/Cookies.xib | 1493 +++++++++++++++++++++++++++---------------- 1 file changed, 957 insertions(+), 536 deletions(-) (limited to 'chrome/app/nibs') diff --git a/chrome/app/nibs/Cookies.xib b/chrome/app/nibs/Cookies.xib index de9ab40..c06c5d8 100644 --- a/chrome/app/nibs/Cookies.xib +++ b/chrome/app/nibs/Cookies.xib @@ -12,7 +12,7 @@ YES - + YES @@ -157,10 +157,7 @@ 2 3 - - 3 - MQA - + 6 System @@ -219,294 +216,6 @@ QSAAAEEgAABBiAAAQYgAAA - - - 34 - - YES - - - 256 - - YES - - - 292 - - YES - - - 265 - {{13, 20}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_EXPIRES_LABEL - - LucidaGrande-Bold - 13 - 16 - - - - - - - - - 265 - {{13, 45}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_CREATED_LABEL - - - - - - - - - 265 - {{13, 70}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_SENDFOR_LABEL - - - - - - - - - 265 - {{13, 95}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_PATH_LABEL - - - - - - - - - 265 - {{13, 120}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_DOMAIN_LABEL - - - - - - - - - 265 - {{13, 145}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_CONTENT_LABEL - - - - - - - - - 265 - {{13, 170}, {82, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COOKIES_COOKIE_NAME_LABEL - - - - - - - - {{-7, -6}, {92, 207}} - - GTMWidthBasedTweaker - - - - 292 - - YES - - - 266 - {{3, 20}, {366, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - - 266 - {{3, 45}, {365, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - - 266 - {{3, 70}, {365, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - - 266 - {{3, 95}, {365, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - - 266 - {{3, 120}, {365, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - - 266 - {{3, 145}, {366, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - - 266 - {{3, 170}, {366, 17}} - - YES - - 70385217 - 272630784 - Label - - - - - - - - {{85, -6}, {386, 207}} - - NSView - - - {{1, 1}, {463, 189}} - - - - {{17, 45}, {465, 191}} - - {0, 0} - - 67239424 - 0 - Box - - - 6 - System - textBackgroundColor - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 1 - 0 - 0 - NO - 292 @@ -602,7 +311,15 @@ YES 1 - + + 6 + System + textBackgroundColor + + 3 + MQA + + 130560 @@ -650,6 +367,423 @@ CAAAAA + + + 34 + + YES + + + 256 + + YES + + + 258 + + YES + + + 292 + + YES + + + 265 + {{13, 20}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_EXPIRES_LABEL + + LucidaGrande-Bold + 13 + 16 + + + + + + + + + 265 + {{13, 45}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_CREATED_LABEL + + + + + + + + + 265 + {{13, 70}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_SENDFOR_LABEL + + + + + + + + + 265 + {{13, 95}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_PATH_LABEL + + + + + + + + + 265 + {{13, 120}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_DOMAIN_LABEL + + + + + + + + + 265 + {{13, 145}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_CONTENT_LABEL + + + + + + + + + 265 + {{13, 170}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_COOKIE_NAME_LABEL + + + + + + + + {{-16, -20}, {92, 207}} + + GTMWidthBasedTweaker + + + + 294 + + YES + + + 266 + {{3, 20}, {366, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 45}, {365, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 70}, {365, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 95}, {365, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 120}, {365, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 145}, {366, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 170}, {366, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + {{76, -20}, {386, 207}} + + NSView + + + {{8, 10}, {446, 171}} + + + + + -2147483390 + + YES + + + 292 + + YES + + + 267 + {{13, 120}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL + + + + + + + + + 267 + {{13, 145}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL + + + + + + + + + 267 + {{13, 170}, {82, 17}} + + YES + + 68288064 + 272630784 + ^IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL + + + + + + + + {{-16, -20}, {92, 207}} + + GTMWidthBasedTweaker + + + + 292 + + YES + + + 266 + {{3, 120}, {365, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 145}, {366, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + + 266 + {{3, 170}, {366, 17}} + + YES + + 70385217 + 272630784 + Label + + + + + + + + {{76, -20}, {386, 207}} + + NSView + + + {{8, 10}, {446, 171}} + + + + {{1, 1}, {462, 189}} + + + + {{18, 45}, {464, 191}} + + {0, 0} + + 67239424 + 0 + Box + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 1 + 0 + 0 + NO + {499, 552} @@ -670,6 +804,8 @@ created expires count + fileSize + lastModified CocoaCookieTreeNode @@ -810,15 +946,63 @@ - value: selection.domain - + enabled: removeButtonEnabled + + + + + + enabled: removeButtonEnabled + enabled + removeButtonEnabled + 2 + + + 176 + + + + updateFilter: + + + + 179 + + + + searchField_ + + + + 180 + + + + outlineView_ + + + + 181 + + + + viewToSlideAndResize_ + + + + 263 + + + + value: selection.created + - + - value: selection.domain + value: selection.created value - selection.domain + selection.created YES @@ -839,19 +1023,19 @@ 2 - 147 + 264 - value: selection.path - + value: selection.sendFor + - + - value: selection.path + value: selection.sendFor value - selection.path + selection.sendFor YES @@ -872,19 +1056,19 @@ 2 - 151 + 265 - value: selection.sendFor - + value: selection.expires + - + - value: selection.sendFor + value: selection.expires value - selection.sendFor + selection.expires YES @@ -905,19 +1089,19 @@ 2 - 154 + 266 - value: selection.created - + value: selection.domain + - + - value: selection.created + value: selection.domain value - selection.created + selection.domain YES @@ -938,19 +1122,19 @@ 2 - 157 + 267 - value: selection.expires - + value: selection.path + - + - value: selection.expires + value: selection.path value - selection.expires + selection.path YES @@ -971,23 +1155,48 @@ 2 - 160 + 268 - - viewToSlideAndResize_ - - + + value: selection.name + + + + + + value: selection.name + value + selection.name + + YES + + YES + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSRaisesForNotApplicableKeys + + + YES + ^IDS_COOKIES_COOKIE_NONESELECTED + ^IDS_COOKIES_COOKIE_NONESELECTED + ^IDS_COOKIES_COOKIE_NONESELECTED + + + + 2 + - 161 + 269 value: selection.content - + - + value: selection.content value @@ -1012,19 +1221,27 @@ 2 - 170 + 270 + + + + viewToSlideAndResize_ + + + + 286 - value: selection.name - + value: selection.domain + - + - value: selection.name + value: selection.domain value - selection.name + selection.domain YES @@ -1045,47 +1262,89 @@ 2 - 173 + 287 - enabled: removeButtonEnabled - - + value: selection.lastModified + + - - - enabled: removeButtonEnabled - enabled - removeButtonEnabled + + + value: selection.lastModified + value + selection.lastModified + + YES + + YES + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSRaisesForNotApplicableKeys + + + YES + ^IDS_COOKIES_COOKIE_NONESELECTED + ^IDS_COOKIES_COOKIE_NONESELECTED + ^IDS_COOKIES_COOKIE_NONESELECTED + + + 2 - 176 + 288 - - updateFilter: - - + + value: selection.fileSize + + + + + + value: selection.fileSize + value + selection.fileSize + + YES + + YES + NSNoSelectionPlaceholder + NSNotApplicablePlaceholder + NSNullPlaceholder + NSRaisesForNotApplicableKeys + + + YES + ^IDS_COOKIES_COOKIE_NONESELECTED + ^IDS_COOKIES_COOKIE_NONESELECTED + ^IDS_COOKIES_COOKIE_NONESELECTED + + + + 2 + - 179 + 289 - searchField_ + cookieInfo_ - + - 180 + 290 - outlineView_ + localStorageInfo_ - + - 181 + 291 @@ -1131,10 +1390,10 @@ YES - + @@ -1197,16 +1456,6 @@ - 14 - - - YES - - - - - - 51 @@ -1273,254 +1522,392 @@ - 132 - + 136 + + + + + 137 + + + + + 177 + YES - - - - - - - + - + - 21 - + 178 + + + + + 231 + YES - + + - + - 22 - - + 232 + + + YES + + + + + Cookie - 23 - + 234 + YES - + + + + + + + - + - 24 - - + 233 + + + YES + + + + + + + + + - 25 - + 255 + YES - + - + - 26 - - + 254 + + + YES + + + - 27 - + 253 + YES - + - + - 28 - - + 252 + + + YES + + + - 29 - + 251 + YES - + - + - 30 - - + 250 + + + YES + + + - 31 - + 249 + YES - + - + + + + 262 + + + + + 261 + + + + + 260 + + - 32 - - + 259 + + - 33 - + 258 + + + + + 257 + + + + + 256 + + + + + 241 + YES - + - - - - 34 - - + - 133 - + 240 + YES - - - - - - - + - + - 47 - + 239 + YES - + - + - 48 - - + 238 + + + YES + + + - 45 - + 237 + YES - + - + - 46 - - + 236 + + + YES + + + - 43 - + 235 + YES - + - + + + + 248 + + + + + 247 + + + + + 246 + + + + + 245 + + + + + 244 + + + + + 243 + + - 44 - - + 242 + + - 41 - + 271 + YES - + + - - - - 42 - - + + Local Storage - 39 - + 272 + YES - + + + - + - 40 - - + 273 + + + YES + + + + + - 37 - + 274 + YES - + - + - 38 - - + 275 + + + YES + + + - 35 - + 276 + YES - + - + - 36 - - + 277 + + - 136 - - + 278 + + - 137 - - + 279 + + - 177 - + 280 + YES - + - + - 178 - - + 281 + + + YES + + + + + + 282 + + + YES + + + + + + 283 + + + + + 284 + + + + + 285 + + @@ -1533,6 +1920,7 @@ -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency + 1.IBViewEditorWindowController.showingLayoutRectangles 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch 1.WindowOrigin @@ -1544,7 +1932,6 @@ 13.IBPluginDependency 136.IBPluginDependency 137.IBPluginDependency - 14.IBPluginDependency 15.IBPluginDependency 16.IBPluginDependency 17.IBPluginDependency @@ -1554,36 +1941,51 @@ 19.IBPluginDependency 2.IBPluginDependency 20.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency - 27.IBPluginDependency - 28.IBPluginDependency - 29.IBPluginDependency + 231.IBPluginDependency + 232.IBPluginDependency + 235.IBPluginDependency + 236.IBPluginDependency + 237.IBPluginDependency + 238.IBPluginDependency + 239.IBPluginDependency + 240.IBPluginDependency + 241.IBPluginDependency + 242.IBPluginDependency + 243.IBPluginDependency + 244.IBPluginDependency + 245.IBPluginDependency + 246.IBPluginDependency + 247.IBPluginDependency + 248.IBPluginDependency + 249.IBPluginDependency + 250.IBPluginDependency + 251.IBPluginDependency + 252.IBPluginDependency + 253.IBPluginDependency + 254.IBPluginDependency + 255.IBPluginDependency + 256.IBPluginDependency + 257.IBPluginDependency + 258.IBPluginDependency + 259.IBPluginDependency + 260.IBPluginDependency + 261.IBPluginDependency + 262.IBPluginDependency + 271.IBPluginDependency + 274.IBPluginDependency + 275.IBPluginDependency + 276.IBPluginDependency + 277.IBPluginDependency + 278.IBPluginDependency + 279.IBPluginDependency + 280.IBPluginDependency + 281.IBPluginDependency + 282.IBPluginDependency + 283.IBPluginDependency + 284.IBPluginDependency + 285.IBPluginDependency 3.IBPluginDependency - 30.IBPluginDependency - 31.IBPluginDependency - 32.IBPluginDependency - 33.IBPluginDependency - 34.IBPluginDependency - 35.IBPluginDependency - 36.IBPluginDependency - 37.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency 4.IBPluginDependency - 40.IBPluginDependency - 41.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency - 44.IBPluginDependency - 45.IBPluginDependency - 46.IBPluginDependency - 47.IBPluginDependency - 48.IBPluginDependency 5.IBPluginDependency 51.IBPluginDependency 6.IBPluginDependency @@ -1595,9 +1997,10 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{498, 155}, {499, 552}} + {{516, 304}, {499, 552}} com.apple.InterfaceBuilder.CocoaPlugin - {{498, 155}, {499, 552}} + + {{516, 304}, {499, 552}} {196, 240} {{357, 418}, {480, 270}} @@ -1653,6 +2056,20 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1671,7 +2088,7 @@ - 181 + 291 @@ -1708,12 +2125,16 @@ YES YES + cookieInfo_ + localStorageInfo_ outlineView_ searchField_ treeController_ YES + NSView + NSView NSOutlineView NSSearchField NSTreeController -- cgit v1.1