| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stack> | 5 #include <stack> |
| 6 | 6 |
| 7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h" | 7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h" |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 ++i; | 536 ++i; |
| 537 } | 537 } |
| 538 } | 538 } |
| 539 | 539 |
| 540 - (IBAction)newFolder:(id)sender { | 540 - (IBAction)newFolder:(id)sender { |
| 541 // Create a new folder off of the selected folder node. | 541 // Create a new folder off of the selected folder node. |
| 542 BookmarkFolderInfo* parentInfo = [self selectedFolder]; | 542 BookmarkFolderInfo* parentInfo = [self selectedFolder]; |
| 543 if (parentInfo) { | 543 if (parentInfo) { |
| 544 NSIndexPath* selection = [self selectedIndexPath]; | 544 NSIndexPath* selection = [self selectedIndexPath]; |
| 545 NSString* newFolderName = | 545 NSString* newFolderName = |
| 546 l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); | 546 l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); |
| 547 BookmarkFolderInfo* folderInfo = | 547 BookmarkFolderInfo* folderInfo = |
| 548 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:newFolderName]; | 548 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:newFolderName]; |
| 549 [self willChangeValueForKey:@"folderTreeArray"]; | 549 [self willChangeValueForKey:@"folderTreeArray"]; |
| 550 NSMutableArray* children = [parentInfo children]; | 550 NSMutableArray* children = [parentInfo children]; |
| 551 if (children) { | 551 if (children) { |
| 552 [children addObject:folderInfo]; | 552 [children addObject:folderInfo]; |
| 553 } else { | 553 } else { |
| 554 children = [NSMutableArray arrayWithObject:folderInfo]; | 554 children = [NSMutableArray arrayWithObject:folderInfo]; |
| 555 [parentInfo setChildren:children]; | 555 [parentInfo setChildren:children]; |
| 556 } | 556 } |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 } | 649 } |
| 650 | 650 |
| 651 // Implementing isEqual: allows the NSTreeController to preserve the selection | 651 // Implementing isEqual: allows the NSTreeController to preserve the selection |
| 652 // and open/shut state of outline items when the data changes. | 652 // and open/shut state of outline items when the data changes. |
| 653 - (BOOL)isEqual:(id)other { | 653 - (BOOL)isEqual:(id)other { |
| 654 return [other isKindOfClass:[BookmarkFolderInfo class]] && | 654 return [other isKindOfClass:[BookmarkFolderInfo class]] && |
| 655 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; | 655 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; |
| 656 } | 656 } |
| 657 | 657 |
| 658 @end | 658 @end |
| OLD | NEW |