Adds local storage nodes to cookie tree model and cookies view.

chrome/browser/cocoa/cookies_window_controller.mm

 // Copyright (c) 2009 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/cocoa/cookies_window_controller.h"
 
 #include <vector>
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
@@ skipping 113 matching lines @@
   return nil;  // We couldn't find the node.
 }
 
 #pragma mark Window Controller
 
 @implementation CookiesWindowController
 
 @synthesize removeButtonEnabled = removeButtonEnabled_;
 @synthesize treeController = treeController_;
 
-- (id)initWithProfile:(Profile*)profile {
+- (id)initWithProfile:(Profile*)profile
+        storageHelper:(BrowsingDataLocalStorageHelper*)storageHelper {
   DCHECK(profile);
   NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"Cookies"
                                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
+    storageHelper_ = storageHelper;
 
     [self loadTreeModelFromProfile];
 
     // Register for Clear Browsing Data controller so we update appropriately.
     ClearBrowsingDataController* clearingController =
         [ClearBrowsingDataController controllerForProfile:profile_];
     if (clearingController) {
       NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
       [center addObserver:self
                  selector:@selector(clearBrowsingDataNotification:)
@@ skipping 148 matching lines @@
 
 - (NSArray*)icons {
   return icons_.get();
 }
 
 // Re-initializes the |treeModel_|, creates a new observer for it, and re-
 // builds the |cocoaTreeModel_|. We use this to initialize the controller and
 // to rebuild after the user clears browsing data. Because the models get
 // clobbered, we rebuild the icon cache for safety (though they do not change).
 - (void)loadTreeModelFromProfile {
-  treeModel_.reset(new CookiesTreeModel(profile_));
+  treeModel_.reset(new CookiesTreeModel(profile_, storageHelper_));
   modelObserver_.reset(new CookiesTreeModelObserverBridge(self));
   treeModel_->SetObserver(modelObserver_.get());
 
   // Convert the model's icons from Skia to Cocoa.
   std::vector<SkBitmap> skiaIcons;
   treeModel_->GetIcons(&skiaIcons);
   icons_.reset([[NSMutableArray alloc] init]);
   for (std::vector<SkBitmap>::iterator it = skiaIcons.begin();
        it != skiaIcons.end(); ++it) {
     [icons_ addObject:gfx::SkBitmapToNSImage(*it)];
   }
 
   // Default icon will be the last item in the array.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // TODO(rsesek): Rename this resource now that it's in multiple places.
   [icons_ addObject:rb.GetNSImageNamed(IDR_BOOKMARK_BAR_FOLDER)];
 
   // Create the Cocoa model.
   CookieTreeNode* root = static_cast<CookieTreeNode*>(treeModel_->GetRoot());
   scoped_nsobject<CocoaCookieTreeNode> model(
       [[CocoaCookieTreeNode alloc] initWithNode:root]);
   [self setCocoaTreeModel:model.get()];  // Takes ownership.
 }
 
 @end