| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/infobars/infobar_container_controller.h" | 5 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
| 9 #include "chrome/browser/infobars/confirm_infobar_delegate.h" | |
| 10 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
| 11 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 10 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 12 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" | 11 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" |
| 13 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h" | 12 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h" |
| 14 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" | 13 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" |
| 15 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 14 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 16 #import "chrome/browser/ui/cocoa/view_id_util.h" | 15 #import "chrome/browser/ui/cocoa/view_id_util.h" |
| 16 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 17 #include "components/infobars/core/infobar.h" | 17 #include "components/infobars/core/infobar.h" |
| 18 #include "components/infobars/core/infobar_container.h" | 18 #include "components/infobars/core/infobar_container.h" |
| 19 | 19 |
| 20 @interface InfoBarContainerController () | 20 @interface InfoBarContainerController () |
| 21 // Removes |controller| from the list of controllers in this container and | 21 // Removes |controller| from the list of controllers in this container and |
| 22 // removes its view from the view hierarchy. This method is safe to call while | 22 // removes its view from the view hierarchy. This method is safe to call while |
| 23 // |controller| is still on the call stack. | 23 // |controller| is still on the call stack. |
| 24 - (void)removeController:(InfoBarController*)controller; | 24 - (void)removeController:(InfoBarController*)controller; |
| 25 @end | 25 @end |
| 26 | 26 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 154 |
| 155 // This code can be executed while InfoBarController is still on the stack, so | 155 // This code can be executed while InfoBarController is still on the stack, so |
| 156 // we retain and autorelease the controller to prevent it from being | 156 // we retain and autorelease the controller to prevent it from being |
| 157 // dealloc'ed too early. | 157 // dealloc'ed too early. |
| 158 [[controller retain] autorelease]; | 158 [[controller retain] autorelease]; |
| 159 [[controller view] removeFromSuperview]; | 159 [[controller view] removeFromSuperview]; |
| 160 [infobarControllers_ removeObject:controller]; | 160 [infobarControllers_ removeObject:controller]; |
| 161 } | 161 } |
| 162 | 162 |
| 163 @end | 163 @end |
| OLD | NEW |