| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/browser/chromeos/login/account_screen.h" | 7 #include "chrome/browser/chromeos/login/account_screen.h" |
| 8 #include "chrome/browser/chromeos/login/eula_view.h" | 8 #include "chrome/browser/chromeos/login/eula_view.h" |
| 9 #include "chrome/browser/chromeos/login/language_switch_menu.h" | 9 #include "chrome/browser/chromeos/login/language_switch_menu.h" |
| 10 #include "chrome/browser/chromeos/login/login_screen.h" | 10 #include "chrome/browser/chromeos/login/login_screen.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 template <class T> MockOutShowHide<T>* | 42 template <class T> MockOutShowHide<T>* |
| 43 CreateMockWizardScreenHelper<T>::Create(WizardController* wizard) { | 43 CreateMockWizardScreenHelper<T>::Create(WizardController* wizard) { |
| 44 return new MockOutShowHide<T>(wizard); | 44 return new MockOutShowHide<T>(wizard); |
| 45 } | 45 } |
| 46 | 46 |
| 47 template <> MockOutShowHide<chromeos::NetworkScreen>* | 47 template <> MockOutShowHide<chromeos::NetworkScreen>* |
| 48 CreateMockWizardScreenHelper<chromeos::NetworkScreen>::Create( | 48 CreateMockWizardScreenHelper<chromeos::NetworkScreen>::Create( |
| 49 WizardController* wizard) { | 49 WizardController* wizard) { |
| 50 return new MockOutShowHide<chromeos::NetworkScreen>(wizard, true); | 50 return new MockOutShowHide<chromeos::NetworkScreen>(wizard); |
| 51 } | 51 } |
| 52 | 52 |
| 53 #define MOCK(mock_var, screen_name, mocked_class) \ | 53 #define MOCK(mock_var, screen_name, mocked_class) \ |
| 54 mock_var = CreateMockWizardScreenHelper<mocked_class>::Create(controller()); \ | 54 mock_var = CreateMockWizardScreenHelper<mocked_class>::Create(controller()); \ |
| 55 controller()->screen_name.reset(mock_var); \ | 55 controller()->screen_name.reset(mock_var); \ |
| 56 EXPECT_CALL(*mock_var, Show()).Times(0); \ | 56 EXPECT_CALL(*mock_var, Show()).Times(0); \ |
| 57 EXPECT_CALL(*mock_var, Hide()).Times(0); | 57 EXPECT_CALL(*mock_var, Hide()).Times(0); |
| 58 | 58 |
| 59 } // namespace | 59 } // namespace |
| 60 | 60 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen)); | 234 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen)); |
| 235 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); | 235 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); |
| 236 | 236 |
| 237 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); | 237 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); |
| 238 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen)); | 238 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen)); |
| 239 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen()); | 239 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen()); |
| 240 } | 240 } |
| 241 | 241 |
| 242 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 17, | 242 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 17, |
| 243 add_tests_for_new_control_flow_you_just_introduced); | 243 add_tests_for_new_control_flow_you_just_introduced); |
| OLD | NEW |