| 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/collected_cookies_mac.h" | 5 #import "chrome/browser/ui/cocoa/collected_cookies_mac.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "app/l10n_util_mac.h" | 9 #include "app/l10n_util_mac.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| 11 #import "base/mac_util.h" | 11 #import "base/mac/mac_util.h" |
| 12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/tab_contents/tab_contents.h" | 14 #include "chrome/browser/tab_contents/tab_contents.h" |
| 15 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" | 15 #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" |
| 16 #include "chrome/common/notification_details.h" | 16 #include "chrome/common/notification_details.h" |
| 17 #include "chrome/common/notification_source.h" | 17 #include "chrome/common/notification_source.h" |
| 18 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
| 19 #include "grit/theme_resources.h" | 19 #include "grit/theme_resources.h" |
| 20 #include "skia/ext/skia_utils_mac.h" | 20 #include "skia/ext/skia_utils_mac.h" |
| 21 #include "third_party/apple/ImageAndTextCell.h" | 21 #include "third_party/apple/ImageAndTextCell.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 | 130 |
| 131 @synthesize allowedTreeController = allowedTreeController_; | 131 @synthesize allowedTreeController = allowedTreeController_; |
| 132 @synthesize blockedTreeController = blockedTreeController_; | 132 @synthesize blockedTreeController = blockedTreeController_; |
| 133 | 133 |
| 134 - (id)initWithTabContents:(TabContents*)tabContents { | 134 - (id)initWithTabContents:(TabContents*)tabContents { |
| 135 DCHECK(tabContents); | 135 DCHECK(tabContents); |
| 136 infoBarVisible_ = NO; | 136 infoBarVisible_ = NO; |
| 137 tabContents_ = tabContents; | 137 tabContents_ = tabContents; |
| 138 | 138 |
| 139 NSString* nibpath = | 139 NSString* nibpath = |
| 140 [mac_util::MainAppBundle() pathForResource:@"CollectedCookies" | 140 [base::mac::MainAppBundle() pathForResource:@"CollectedCookies" |
| 141 ofType:@"nib"]; | 141 ofType:@"nib"]; |
| 142 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { | 142 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { |
| 143 [self loadTreeModelFromTabContents]; | 143 [self loadTreeModelFromTabContents]; |
| 144 | 144 |
| 145 animation_.reset([[NSViewAnimation alloc] init]); | 145 animation_.reset([[NSViewAnimation alloc] init]); |
| 146 [animation_ setAnimationBlockingMode:NSAnimationNonblocking]; | 146 [animation_ setAnimationBlockingMode:NSAnimationNonblocking]; |
| 147 } | 147 } |
| 148 return self; | 148 return self; |
| 149 } | 149 } |
| 150 | 150 |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 nil]]; | 491 nil]]; |
| 492 [animation_ setViewAnimations:animations]; | 492 [animation_ setViewAnimations:animations]; |
| 493 // The default duration is 0.5s, which actually feels slow in here, so speed | 493 // The default duration is 0.5s, which actually feels slow in here, so speed |
| 494 // it up a bit. | 494 // it up a bit. |
| 495 [animation_ gtm_setDuration:0.2 | 495 [animation_ gtm_setDuration:0.2 |
| 496 eventMask:NSLeftMouseUpMask]; | 496 eventMask:NSLeftMouseUpMask]; |
| 497 [animation_ startAnimation]; | 497 [animation_ startAnimation]; |
| 498 } | 498 } |
| 499 | 499 |
| 500 @end | 500 @end |
| OLD | NEW |