OLD | NEW |
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 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" | 5 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/mac/bundle_locations.h" | 9 #include "base/mac/bundle_locations.h" |
10 #import "base/mac/mac_util.h" | 10 #import "base/mac/mac_util.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 [[detailsViewController_.get() view] setFrame:viewFrameRect]; | 207 [[detailsViewController_.get() view] setFrame:viewFrameRect]; |
208 [[cookieDetailsViewPlaceholder_ superview] | 208 [[cookieDetailsViewPlaceholder_ superview] |
209 replaceSubview:cookieDetailsViewPlaceholder_ | 209 replaceSubview:cookieDetailsViewPlaceholder_ |
210 with:detailView]; | 210 with:detailView]; |
211 | 211 |
212 [self tabView:tabView_ didSelectTabViewItem:[tabView_ selectedTabViewItem]]; | 212 [self tabView:tabView_ didSelectTabViewItem:[tabView_ selectedTabViewItem]]; |
213 } | 213 } |
214 | 214 |
215 - (void)windowWillClose:(NSNotification*)notif { | 215 - (void)windowWillClose:(NSNotification*)notif { |
216 if (contentSettingsChanged_) { | 216 if (contentSettingsChanged_) { |
217 InfoBarService* infobarService = | 217 CollectedCookiesInfoBarDelegate::Create( |
218 InfoBarService::FromWebContents(webContents_); | 218 InfoBarService::FromWebContents(webContents_)); |
219 infobarService->AddInfoBar( | |
220 new CollectedCookiesInfoBarDelegate(infobarService)); | |
221 } | 219 } |
222 [allowedOutlineView_ setDelegate:nil]; | 220 [allowedOutlineView_ setDelegate:nil]; |
223 [blockedOutlineView_ setDelegate:nil]; | 221 [blockedOutlineView_ setDelegate:nil]; |
224 [animation_ stopAnimation]; | 222 [animation_ stopAnimation]; |
225 } | 223 } |
226 | 224 |
227 - (IBAction)closeSheet:(id)sender { | 225 - (IBAction)closeSheet:(id)sender { |
228 collectedCookiesMac_->PerformClose(); | 226 collectedCookiesMac_->PerformClose(); |
229 } | 227 } |
230 | 228 |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 treeController = blockedTreeController_; | 512 treeController = blockedTreeController_; |
515 break; | 513 break; |
516 default: | 514 default: |
517 NOTREACHED(); | 515 NOTREACHED(); |
518 return; | 516 return; |
519 } | 517 } |
520 [detailsViewController_ configureBindingsForTreeController:treeController]; | 518 [detailsViewController_ configureBindingsForTreeController:treeController]; |
521 } | 519 } |
522 | 520 |
523 @end | 521 @end |
OLD | NEW |