| 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 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include <utility> |
| 10 |
| 9 #include "base/mac/scoped_nsobject.h" | 11 #include "base/mac/scoped_nsobject.h" |
| 10 #include "chrome/browser/infobars/infobar_service.h" | 12 #include "chrome/browser/infobars/infobar_service.h" |
| 11 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 12 #import "chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.h" | 14 #import "chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.h" |
| 13 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" | 15 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" |
| 14 #include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h" | 16 #include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h" |
| 15 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" | 17 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" |
| 16 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
| 17 #import "content/public/browser/web_contents.h" | 19 #import "content/public/browser/web_contents.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 [resizeDelegate_ resizeView:[controller_ view] newHeight:-1]; | 57 [resizeDelegate_ resizeView:[controller_ view] newHeight:-1]; |
| 56 [controller_ positionInfoBarsAndRedraw:NO]; | 58 [controller_ positionInfoBarsAndRedraw:NO]; |
| 57 EXPECT_NE(-1, [resizeDelegate_ height]); | 59 EXPECT_NE(-1, [resizeDelegate_ height]); |
| 58 } | 60 } |
| 59 | 61 |
| 60 TEST_F(InfoBarContainerControllerTest, AddAndRemoveInfoBars) { | 62 TEST_F(InfoBarContainerControllerTest, AddAndRemoveInfoBars) { |
| 61 NSView* view = [controller_ view]; | 63 NSView* view = [controller_ view]; |
| 62 | 64 |
| 63 scoped_ptr<infobars::InfoBarDelegate> confirm_delegate( | 65 scoped_ptr<infobars::InfoBarDelegate> confirm_delegate( |
| 64 new MockConfirmInfoBarDelegate(NULL)); | 66 new MockConfirmInfoBarDelegate(NULL)); |
| 65 scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(confirm_delegate.Pass())); | 67 scoped_ptr<InfoBarCocoa> infobar( |
| 68 new InfoBarCocoa(std::move(confirm_delegate))); |
| 66 base::scoped_nsobject<ConfirmInfoBarController> controller( | 69 base::scoped_nsobject<ConfirmInfoBarController> controller( |
| 67 [[ConfirmInfoBarController alloc] initWithInfoBar:infobar.get()]); | 70 [[ConfirmInfoBarController alloc] initWithInfoBar:infobar.get()]); |
| 68 infobar->set_controller(controller); | 71 infobar->set_controller(controller); |
| 69 [controller_ addInfoBar:infobar.get() position:0]; | 72 [controller_ addInfoBar:infobar.get() position:0]; |
| 70 EXPECT_EQ(1U, [[view subviews] count]); | 73 EXPECT_EQ(1U, [[view subviews] count]); |
| 71 | 74 |
| 72 [controller_ removeInfoBar:infobar.get()]; | 75 [controller_ removeInfoBar:infobar.get()]; |
| 73 EXPECT_EQ(0U, [[view subviews] count]); | 76 EXPECT_EQ(0U, [[view subviews] count]); |
| 74 } | 77 } |
| 75 | 78 |
| 76 } // namespace | 79 } // namespace |
| OLD | NEW |