| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "chrome/browser/ui/cocoa/options/cookies_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/options/cookies_window_controller.h" |
| 6 | 6 |
| 7 #include <queue> | 7 #include <queue> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #import "base/mac/mac_util.h" | 10 #import "base/mac/mac_util.h" |
| 11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 12 #include "chrome/browser/browsing_data_remover.h" | 12 #include "chrome/browser/browsing_data_remover.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" | 14 #include "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" |
| 15 #include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controlle
r.h" | 15 #include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controlle
r.h" |
| 16 #include "grit/generated_resources.h" | 16 #include "grit/generated_resources.h" |
| 17 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
| 18 #include "skia/ext/skia_utils_mac.h" | 18 #include "skia/ext/skia_utils_mac.h" |
| 19 #include "third_party/apple/ImageAndTextCell.h" | 19 #include "third_party/apple/ImageAndTextCell.h" |
| 20 #include "third_party/skia/include/core/SkBitmap.h" | 20 #include "third_party/skia/include/core/SkBitmap.h" |
| 21 #include "ui/base/l10n/l10n_util_mac.h" | 21 #include "ui/base/l10n/l10n_util_mac.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/gfx/image.h" |
| 23 | 24 |
| 24 // Key path used for notifying KVO. | 25 // Key path used for notifying KVO. |
| 25 static NSString* const kCocoaTreeModel = @"cocoaTreeModel"; | 26 static NSString* const kCocoaTreeModel = @"cocoaTreeModel"; |
| 26 | 27 |
| 27 CookiesTreeModelObserverBridge::CookiesTreeModelObserverBridge( | 28 CookiesTreeModelObserverBridge::CookiesTreeModelObserverBridge( |
| 28 CookiesWindowController* controller) | 29 CookiesWindowController* controller) |
| 29 : window_controller_(controller), | 30 : window_controller_(controller), |
| 30 batch_update_(false) { | 31 batch_update_(false) { |
| 31 } | 32 } |
| 32 | 33 |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 [icons_ addObject:rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER)]; | 440 [icons_ addObject:rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER)]; |
| 440 | 441 |
| 441 // Create the Cocoa model. | 442 // Create the Cocoa model. |
| 442 CookieTreeNode* root = static_cast<CookieTreeNode*>(treeModel_->GetRoot()); | 443 CookieTreeNode* root = static_cast<CookieTreeNode*>(treeModel_->GetRoot()); |
| 443 scoped_nsobject<CocoaCookieTreeNode> model( | 444 scoped_nsobject<CocoaCookieTreeNode> model( |
| 444 [[CocoaCookieTreeNode alloc] initWithNode:root]); | 445 [[CocoaCookieTreeNode alloc] initWithNode:root]); |
| 445 [self setCocoaTreeModel:model.get()]; // Takes ownership. | 446 [self setCocoaTreeModel:model.get()]; // Takes ownership. |
| 446 } | 447 } |
| 447 | 448 |
| 448 @end | 449 @end |
| OLD | NEW |