| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 | 575 |
| 576 - (void)createNewFoldersForFolder:(BookmarkFolderInfo*)folderInfo | 576 - (void)createNewFoldersForFolder:(BookmarkFolderInfo*)folderInfo |
| 577 selectedFolderInfo:(BookmarkFolderInfo*)selectedFolderInfo { | 577 selectedFolderInfo:(BookmarkFolderInfo*)selectedFolderInfo { |
| 578 NSArray* subfolders = [folderInfo children]; | 578 NSArray* subfolders = [folderInfo children]; |
| 579 const BookmarkNode* parentNode = [folderInfo folderNode]; | 579 const BookmarkNode* parentNode = [folderInfo folderNode]; |
| 580 DCHECK(parentNode); | 580 DCHECK(parentNode); |
| 581 NSUInteger i = 0; | 581 NSUInteger i = 0; |
| 582 for (BookmarkFolderInfo* subFolderInfo in subfolders) { | 582 for (BookmarkFolderInfo* subFolderInfo in subfolders) { |
| 583 if ([subFolderInfo newFolder]) { | 583 if ([subFolderInfo newFolder]) { |
| 584 BookmarkModel* model = [self bookmarkModel]; | 584 BookmarkModel* model = [self bookmarkModel]; |
| 585 NSString* name = [subFolderInfo folderName]; |
| 586 if ([name length] == 0) |
| 587 name = |
| 588 l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); |
| 585 const BookmarkNode* newFolder = | 589 const BookmarkNode* newFolder = |
| 586 model->AddFolder(parentNode, i, | 590 model->AddFolder(parentNode, i, |
| 587 base::SysNSStringToUTF16([subFolderInfo folderName])); | 591 base::SysNSStringToUTF16(name)); |
| 588 // Update our dictionary with the actual folder node just created. | 592 // Update our dictionary with the actual folder node just created. |
| 589 [subFolderInfo setFolderNode:newFolder]; | 593 [subFolderInfo setFolderNode:newFolder]; |
| 590 [subFolderInfo setNewFolder:NO]; | 594 [subFolderInfo setNewFolder:NO]; |
| 591 } | 595 } |
| 592 [self createNewFoldersForFolder:subFolderInfo | 596 [self createNewFoldersForFolder:subFolderInfo |
| 593 selectedFolderInfo:selectedFolderInfo]; | 597 selectedFolderInfo:selectedFolderInfo]; |
| 594 ++i; | 598 ++i; |
| 595 } | 599 } |
| 596 } | 600 } |
| 597 | 601 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 } | 720 } |
| 717 | 721 |
| 718 // Implementing isEqual: allows the NSTreeController to preserve the selection | 722 // Implementing isEqual: allows the NSTreeController to preserve the selection |
| 719 // and open/shut state of outline items when the data changes. | 723 // and open/shut state of outline items when the data changes. |
| 720 - (BOOL)isEqual:(id)other { | 724 - (BOOL)isEqual:(id)other { |
| 721 return [other isKindOfClass:[BookmarkFolderInfo class]] && | 725 return [other isKindOfClass:[BookmarkFolderInfo class]] && |
| 722 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; | 726 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; |
| 723 } | 727 } |
| 724 | 728 |
| 725 @end | 729 @end |
| OLD | NEW |