Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(840)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

Issue 1203713002: Limit access to ChromeBookmarkClient to bookmarks code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_bookmark_client
Patch Set: Rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/strings/sys_string_conversions.h" 12 #include "base/strings/sys_string_conversions.h"
13 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
14 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
15 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
16 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h" 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 19 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
22 #include "chrome/grit/generated_resources.h" 20 #include "chrome/grit/generated_resources.h"
23 #include "components/bookmarks/browser/bookmark_model.h" 21 #include "components/bookmarks/browser/bookmark_model.h"
24 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/l10n/l10n_util_mac.h" 23 #include "ui/base/l10n/l10n_util_mac.h"
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 break; 496 break;
499 } 497 }
500 ++i; 498 ++i;
501 } 499 }
502 } 500 }
503 DCHECK([path length] == stackSize); 501 DCHECK([path length] == stackSize);
504 return path; 502 return path;
505 } 503 }
506 504
507 - (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node { 505 - (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node {
508 ChromeBookmarkClient* client = 506 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
509 ChromeBookmarkClientFactory::GetForProfile(profile_);
510 NSMutableArray* childFolders = nil; 507 NSMutableArray* childFolders = nil;
511 int childCount = node->child_count(); 508 int childCount = node->child_count();
512 for (int i = 0; i < childCount; ++i) { 509 for (int i = 0; i < childCount; ++i) {
513 const BookmarkNode* childNode = node->GetChild(i); 510 const BookmarkNode* childNode = node->GetChild(i);
514 if (childNode->is_folder() && childNode->IsVisible() && 511 if (childNode->is_folder() && childNode->IsVisible() &&
515 client->CanBeEditedByUser(childNode)) { 512 model->CanBeEditedByUser(childNode)) {
516 NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle()); 513 NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle());
517 NSMutableArray* children = [self addChildFoldersFromNode:childNode]; 514 NSMutableArray* children = [self addChildFoldersFromNode:childNode];
518 BookmarkFolderInfo* folderInfo = 515 BookmarkFolderInfo* folderInfo =
519 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:childName 516 [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:childName
520 folderNode:childNode 517 folderNode:childNode
521 children:children]; 518 children:children];
522 if (!childFolders) 519 if (!childFolders)
523 childFolders = [NSMutableArray arrayWithObject:folderInfo]; 520 childFolders = [NSMutableArray arrayWithObject:folderInfo];
524 else 521 else
525 [childFolders addObject:folderInfo]; 522 [childFolders addObject:folderInfo];
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 } 712 }
716 713
717 // Implementing isEqual: allows the NSTreeController to preserve the selection 714 // Implementing isEqual: allows the NSTreeController to preserve the selection
718 // and open/shut state of outline items when the data changes. 715 // and open/shut state of outline items when the data changes.
719 - (BOOL)isEqual:(id)other { 716 - (BOOL)isEqual:(id)other {
720 return [other isKindOfClass:[BookmarkFolderInfo class]] && 717 return [other isKindOfClass:[BookmarkFolderInfo class]] &&
721 folderNode_ == [(BookmarkFolderInfo*)other folderNode]; 718 folderNode_ == [(BookmarkFolderInfo*)other folderNode];
722 } 719 }
723 720
724 @end 721 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698