OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h" | 5 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h" |
6 | 6 |
| 7 #include <memory> |
7 #include <utility> | 8 #include <utility> |
8 | 9 |
9 #include "base/bind.h" | 10 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
11 #include "base/macros.h" | 12 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h" | 13 #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h" |
14 #include "content/public/test/test_utils.h" | 14 #include "content/public/test/test_utils.h" |
15 #include "ui/events/event_utils.h" | 15 #include "ui/events/event_utils.h" |
16 #include "ui/views/controls/button/label_button.h" | 16 #include "ui/views/controls/button/label_button.h" |
17 #include "ui/views/test/views_test_base.h" | 17 #include "ui/views/test/views_test_base.h" |
18 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
19 | 19 |
20 class OneClickSigninBubbleViewTest : public views::ViewsTestBase, | 20 class OneClickSigninBubbleViewTest : public views::ViewsTestBase, |
21 public views::WidgetObserver { | 21 public views::WidgetObserver { |
22 public: | 22 public: |
(...skipping 13 matching lines...) Expand all Loading... |
36 void TearDown() override { | 36 void TearDown() override { |
37 OneClickSigninBubbleView::Hide(); | 37 OneClickSigninBubbleView::Hide(); |
38 anchor_widget_->Close(); | 38 anchor_widget_->Close(); |
39 anchor_widget_ = NULL; | 39 anchor_widget_ = NULL; |
40 views::ViewsTestBase::TearDown(); | 40 views::ViewsTestBase::TearDown(); |
41 } | 41 } |
42 | 42 |
43 protected: | 43 protected: |
44 OneClickSigninBubbleView* ShowOneClickSigninBubble( | 44 OneClickSigninBubbleView* ShowOneClickSigninBubble( |
45 BrowserWindow::OneClickSigninBubbleType bubble_type) { | 45 BrowserWindow::OneClickSigninBubbleType bubble_type) { |
46 | 46 std::unique_ptr<OneClickSigninBubbleDelegate> delegate; |
47 scoped_ptr<OneClickSigninBubbleDelegate> delegate; | |
48 delegate.reset(new OneClickSigninBubbleTestDelegate(this)); | 47 delegate.reset(new OneClickSigninBubbleTestDelegate(this)); |
49 | 48 |
50 OneClickSigninBubbleView::ShowBubble( | 49 OneClickSigninBubbleView::ShowBubble( |
51 bubble_type, base::string16(), base::string16(), std::move(delegate), | 50 bubble_type, base::string16(), base::string16(), std::move(delegate), |
52 anchor_widget_->GetContentsView(), | 51 anchor_widget_->GetContentsView(), |
53 base::Bind(&OneClickSigninBubbleViewTest::OnStartSync, | 52 base::Bind(&OneClickSigninBubbleViewTest::OnStartSync, |
54 base::Unretained(this))); | 53 base::Unretained(this))); |
55 | 54 |
56 OneClickSigninBubbleView* view = | 55 OneClickSigninBubbleView* view = |
57 OneClickSigninBubbleView::view_for_testing(); | 56 OneClickSigninBubbleView::view_for_testing(); |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 // Simulate pressing the Escape key. | 310 // Simulate pressing the Escape key. |
312 views::View* view = one_click_view; | 311 views::View* view = one_click_view; |
313 const ui::Accelerator accelerator(ui::VKEY_ESCAPE, 0); | 312 const ui::Accelerator accelerator(ui::VKEY_ESCAPE, 0); |
314 view->AcceleratorPressed(accelerator); | 313 view->AcceleratorPressed(accelerator); |
315 | 314 |
316 WaitForClose(); | 315 WaitForClose(); |
317 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); | 316 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); |
318 EXPECT_TRUE(on_start_sync_called_); | 317 EXPECT_TRUE(on_start_sync_called_); |
319 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_); | 318 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_); |
320 } | 319 } |
OLD | NEW |