diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 10:57:18 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 10:57:18 +0000 |
| commit | 4757aecb7691429748791c315b17b7f402869197 (patch) | |
| tree | f04b1423d0322aff680182508f666f438decfaac /chrome | |
| parent | e069739561c16092f24df33eafd54f8ab9e5697f (diff) | |
| download | chromium_src-4757aecb7691429748791c315b17b7f402869197.zip chromium_src-4757aecb7691429748791c315b17b7f402869197.tar.gz chromium_src-4757aecb7691429748791c315b17b7f402869197.tar.bz2 | |
Mac: fix enabling of remove button in cookie tree when there is a selection
Change in xib file disables "avoid empty selection" which leads to an item in the tree already being selected when the dialog opens.
BUG=http://crbug/38069
TEST=manual testing and existing flaky unit test FLAKY_RemoveButtonEnabled
Review URL: http://codereview.chromium.org/841004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/nibs/Cookies.xib | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/cookies_window_controller.mm | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/app/nibs/Cookies.xib b/chrome/app/nibs/Cookies.xib index 55e5859..c53b9f6 100644 --- a/chrome/app/nibs/Cookies.xib +++ b/chrome/app/nibs/Cookies.xib @@ -393,7 +393,6 @@ </object> <string key="NSObjectClassName">CocoaCookieTreeNode</string> <object class="_NSManagedProxy" key="_NSManagedProxy"/> - <bool key="NSAvoidsEmptySelection">YES</bool> <bool key="NSPreservesSelection">YES</bool> <bool key="NSSelectsInsertedObjects">YES</bool> <string key="NSTreeContentChildrenKey">children</string> @@ -829,10 +828,10 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{636, 283}, {499, 552}}</string> + <string>{{610, 283}, {499, 552}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES" id="5"/> - <string>{{636, 283}, {499, 552}}</string> + <string>{{610, 283}, {499, 552}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> diff --git a/chrome/browser/cocoa/cookies_window_controller.mm b/chrome/browser/cocoa/cookies_window_controller.mm index d3b6035..8a2b5be 100644 --- a/chrome/browser/cocoa/cookies_window_controller.mm +++ b/chrome/browser/cocoa/cookies_window_controller.mm @@ -384,6 +384,10 @@ bool CookiesTreeModelObserverBridge::HasCocoaModel() { } node = [[node children] objectAtIndex:childIndex]; } + + // If there is a valid selection, make sure that the remove + // button is enabled. + [self setRemoveButtonEnabled:YES]; } #pragma mark Unit Testing |