| 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_dialog_view.h" | 5 #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 OneClickSigninDialogView::Hide(); | 43 OneClickSigninDialogView::Hide(); |
| 44 anchor_widget_->Close(); | 44 anchor_widget_->Close(); |
| 45 anchor_widget_ = NULL; | 45 anchor_widget_ = NULL; |
| 46 views::ViewsTestBase::TearDown(); | 46 views::ViewsTestBase::TearDown(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 protected: | 49 protected: |
| 50 OneClickSigninDialogView* ShowOneClickSigninDialog() { | 50 OneClickSigninDialogView* ShowOneClickSigninDialog() { |
| 51 OneClickSigninDialogView::ShowDialog( | 51 OneClickSigninDialogView::ShowDialog( |
| 52 base::string16(), | 52 base::string16(), |
| 53 base::WrapUnique(new TestOneClickSigninLinksDelegate(this)), | 53 base::MakeUnique<TestOneClickSigninLinksDelegate>(this), |
| 54 anchor_widget_->GetNativeWindow(), | 54 anchor_widget_->GetNativeWindow(), |
| 55 base::Bind(&OneClickSigninDialogViewTest::OnStartSync, | 55 base::Bind(&OneClickSigninDialogViewTest::OnStartSync, |
| 56 base::Unretained(this))); | 56 base::Unretained(this))); |
| 57 | 57 |
| 58 OneClickSigninDialogView* view = | 58 OneClickSigninDialogView* view = |
| 59 OneClickSigninDialogView::view_for_testing(); | 59 OneClickSigninDialogView::view_for_testing(); |
| 60 EXPECT_TRUE(view != NULL); | 60 EXPECT_TRUE(view != NULL); |
| 61 return view; | 61 return view; |
| 62 } | 62 } |
| 63 | 63 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 TEST_F(OneClickSigninDialogViewTest, PressEscapeKey) { | 209 TEST_F(OneClickSigninDialogViewTest, PressEscapeKey) { |
| 210 OneClickSigninDialogView* one_click_view = ShowOneClickSigninDialog(); | 210 OneClickSigninDialogView* one_click_view = ShowOneClickSigninDialog(); |
| 211 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, 0); | 211 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, 0); |
| 212 one_click_view->GetWidget()->OnKeyEvent(&event); | 212 one_click_view->GetWidget()->OnKeyEvent(&event); |
| 213 | 213 |
| 214 WaitForClose(); | 214 WaitForClose(); |
| 215 EXPECT_FALSE(OneClickSigninDialogView::IsShowing()); | 215 EXPECT_FALSE(OneClickSigninDialogView::IsShowing()); |
| 216 EXPECT_TRUE(on_start_sync_called_); | 216 EXPECT_TRUE(on_start_sync_called_); |
| 217 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_); | 217 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_); |
| 218 } | 218 } |
| OLD | NEW |