bookmarks: Remove Profile getter accessor from BookmarkModel.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 217 matching lines @@
 }
 
 @end
 
 @implementation BookmarkBarFolderController
 
 @synthesize subFolderGrowthToRight = subFolderGrowthToRight_;
 
 - (id)initWithParentButton:(BookmarkButton*)button
           parentController:(BookmarkBarFolderController*)parentController
-             barController:(BookmarkBarController*)barController {
+             barController:(BookmarkBarController*)barController
+             profile:(Profile*)profile {

[Alexei Svitkine (slow), 2013/03/27 15:16:39]

align the :'s

[tfarina, 2013/03/27 21:02:27]

Done.

   NSString* nibPath =
       [base::mac::FrameworkBundle() pathForResource:@"BookmarkBarFolderWindow"
                                              ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     parentButton_.reset([button retain]);
     selectedIndex_ = -1;
 
+    profile_ = profile;
+
     // We want the button to remain bordered as part of the menu path.
     [button forceButtonBorderToStayOnAlways:YES];
 
     // Pick the parent button's screen to be the screen upon which all display
     // happens. This loop over all screens is not equivalent to
     // |[[button window] screen]|. BookmarkButtons are commonly positioned near
     // the edge of their windows (both in the bookmark bar and in other bookmark
     // menus), and |[[button window] screen]| would return the screen that the
     // majority of their window was on even if the parent button were clearly
     // contained within a different screen.
@@ skipping 1199 matching lines @@
     }
   }
   return dragged;
 }
 
 // TODO(mrossetti,jrg): Identical to the same function in BookmarkBarController.
 // http://crbug.com/35966
 - (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData {
   std::vector<const BookmarkNode*> dragDataNodes;
   BookmarkNodeData dragData;
-  if(dragData.ReadFromDragClipboard()) {
-    BookmarkModel* bookmarkModel = [self bookmarkModel];
-    Profile* profile = bookmarkModel->profile();
-    std::vector<const BookmarkNode*> nodes(dragData.GetNodes(profile));
+  if (dragData.ReadFromDragClipboard()) {
+    std::vector<const BookmarkNode*> nodes(dragData.GetNodes(profile_));
     dragDataNodes.assign(nodes.begin(), nodes.end());
   }
   return dragDataNodes;
 }
 
 // Return YES if we should show the drop indicator, else NO.
 // TODO(jrg): ARGH code dup!
 // http://crbug.com/35966
 - (BOOL)shouldShowIndicatorShownForPoint:(NSPoint)point {
   return ![self buttonForDroppingOnAtPoint:point];
@@ skipping 245 matching lines @@
 
 // Add a new folder controller as triggered by the given folder button.
 - (void)addNewFolderControllerWithParentButton:(BookmarkButton*)parentButton {
   if (folderController_)
     [self closeBookmarkFolder:self];
 
   // Folder controller, like many window controllers, owns itself.
   folderController_ =
       [[BookmarkBarFolderController alloc] initWithParentButton:parentButton
                                                parentController:self
-                                                  barController:barController_];
+                                                  barController:barController_
+                                                  profile:profile_];

[Alexei Svitkine (slow), 2013/03/27 15:16:39]

Align the :'s

[tfarina, 2013/03/27 21:02:27]

Done.

   [folderController_ showWindow:self];
 }
 
 - (void)openAll:(const BookmarkNode*)node
     disposition:(WindowOpenDisposition)disposition {
   [barController_ openAll:node disposition:disposition];
 }
 
 - (void)addButtonForNode:(const BookmarkNode*)node
                  atIndex:(NSInteger)buttonIndex {
@@ skipping 220 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController