| 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" |
| 11 #include "base/mac/bundle_locations.h" | 11 #include "base/mac/bundle_locations.h" |
| 12 #include "base/mac/mac_util.h" | 12 #include "base/mac/mac_util.h" |
| 13 #include "base/strings/sys_string_conversions.h" | 13 #include "base/strings/sys_string_conversions.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 15 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 15 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" |
| 16 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" | 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" |
| 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" | 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" |
| 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" | 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" |
| 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h" | 21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h" |
| 21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 22 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 22 #include "components/bookmarks/browser/bookmark_model.h" | 23 #include "components/bookmarks/browser/bookmark_model.h" |
| 23 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/base/l10n/l10n_util_mac.h" | 26 #include "ui/base/l10n/l10n_util_mac.h" |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 } | 500 } |
| 500 ++i; | 501 ++i; |
| 501 } | 502 } |
| 502 } | 503 } |
| 503 DCHECK([path length] == stackSize); | 504 DCHECK([path length] == stackSize); |
| 504 return path; | 505 return path; |
| 505 } | 506 } |
| 506 | 507 |
| 507 - (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node { | 508 - (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node { |
| 508 ChromeBookmarkClient* client = | 509 ChromeBookmarkClient* client = |
| 509 BookmarkModelFactory::GetChromeBookmarkClientForProfile(profile_); | 510 ChromeBookmarkClientFactory::GetForProfile(profile_); |
| 510 NSMutableArray* childFolders = nil; | 511 NSMutableArray* childFolders = nil; |
| 511 int childCount = node->child_count(); | 512 int childCount = node->child_count(); |
| 512 for (int i = 0; i < childCount; ++i) { | 513 for (int i = 0; i < childCount; ++i) { |
| 513 const BookmarkNode* childNode = node->GetChild(i); | 514 const BookmarkNode* childNode = node->GetChild(i); |
| 514 if (childNode->is_folder() && childNode->IsVisible() && | 515 if (childNode->is_folder() && childNode->IsVisible() && |
| 515 client->CanBeEditedByUser(childNode)) { | 516 client->CanBeEditedByUser(childNode)) { |
| 516 NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle()); | 517 NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle()); |
| 517 NSMutableArray* children = [self addChildFoldersFromNode:childNode]; | 518 NSMutableArray* children = [self addChildFoldersFromNode:childNode]; |
| 518 BookmarkFolderInfo* folderInfo = | 519 BookmarkFolderInfo* folderInfo = |
| 519 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:childName | 520 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:childName |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 } | 716 } |
| 716 | 717 |
| 717 // Implementing isEqual: allows the NSTreeController to preserve the selection | 718 // Implementing isEqual: allows the NSTreeController to preserve the selection |
| 718 // and open/shut state of outline items when the data changes. | 719 // and open/shut state of outline items when the data changes. |
| 719 - (BOOL)isEqual:(id)other { | 720 - (BOOL)isEqual:(id)other { |
| 720 return [other isKindOfClass:[BookmarkFolderInfo class]] && | 721 return [other isKindOfClass:[BookmarkFolderInfo class]] && |
| 721 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; | 722 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; |
| 722 } | 723 } |
| 723 | 724 |
| 724 @end | 725 @end |
| OLD | NEW |