| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "ios/chrome/browser/infobars/infobar.h" | 5 #include "ios/chrome/browser/infobars/infobar.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "components/infobars/core/confirm_infobar_delegate.h" | 10 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 11 #include "components/translate/core/browser/translate_infobar_delegate.h" | 11 #include "components/translate/core/browser/translate_infobar_delegate.h" |
| 12 #import "ios/chrome/browser/infobars/confirm_infobar_controller.h" | 12 #import "ios/chrome/browser/infobars/confirm_infobar_controller.h" |
| 13 #include "ios/chrome/browser/infobars/infobar_controller.h" | 13 #include "ios/chrome/browser/infobars/infobar_controller.h" |
| 14 #include "ios/chrome/browser/translate/translate_infobar_tags.h" | 14 #include "ios/chrome/browser/translate/translate_infobar_tags.h" |
| 15 | 15 |
| 16 using infobars::InfoBar; | 16 using infobars::InfoBar; |
| 17 using infobars::InfoBarDelegate; | 17 using infobars::InfoBarDelegate; |
| 18 | 18 |
| 19 InfoBarIOS::InfoBarIOS(scoped_ptr<InfoBarDelegate> delegate) | 19 InfoBarIOS::InfoBarIOS(std::unique_ptr<InfoBarDelegate> delegate) |
| 20 : InfoBar(std::move(delegate)) {} | 20 : InfoBar(std::move(delegate)) {} |
| 21 | 21 |
| 22 InfoBarIOS::~InfoBarIOS() { | 22 InfoBarIOS::~InfoBarIOS() { |
| 23 DCHECK(controller_); | 23 DCHECK(controller_); |
| 24 [controller_ detachView]; | 24 [controller_ detachView]; |
| 25 controller_.reset(); | 25 controller_.reset(); |
| 26 } | 26 } |
| 27 | 27 |
| 28 void InfoBarIOS::SetController(InfoBarController* controller) { | 28 void InfoBarIOS::SetController(InfoBarController* controller) { |
| 29 controller_.reset([controller retain]); | 29 controller_.reset([controller retain]); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 } | 115 } |
| 116 } | 116 } |
| 117 | 117 |
| 118 void InfoBarIOS::InfoBarDidCancel() { | 118 void InfoBarIOS::InfoBarDidCancel() { |
| 119 // If not owned, the infobar has already been removed. | 119 // If not owned, the infobar has already been removed. |
| 120 if (!owner()) | 120 if (!owner()) |
| 121 return; | 121 return; |
| 122 delegate()->InfoBarDismissed(); | 122 delegate()->InfoBarDismissed(); |
| 123 RemoveSelf(); | 123 RemoveSelf(); |
| 124 } | 124 } |
| OLD | NEW |