Chromium Code Reviews| 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 #include "base/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" | 7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" |
| 8 #include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_sc reen.h" | 8 #include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_sc reen.h" |
| 9 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 9 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 10 #include "chrome/browser/chromeos/login/language_switch_menu.h" | 10 #include "chrome/browser/chromeos/login/language_switch_menu.h" |
| 11 #include "chrome/browser/chromeos/login/mock_eula_screen.h" | 11 #include "chrome/browser/chromeos/login/mock_eula_screen.h" |
| 12 #include "chrome/browser/chromeos/login/mock_network_screen.h" | 12 #include "chrome/browser/chromeos/login/mock_network_screen.h" |
| 13 #include "chrome/browser/chromeos/login/mock_update_screen.h" | 13 #include "chrome/browser/chromeos/login/mock_update_screen.h" |
| 14 #include "chrome/browser/chromeos/login/network_screen.h" | 14 #include "chrome/browser/chromeos/login/network_screen.h" |
| 15 #include "chrome/browser/chromeos/login/network_selection_view.h" | |
| 16 #include "chrome/browser/chromeos/login/user_image_screen.h" | 15 #include "chrome/browser/chromeos/login/user_image_screen.h" |
| 17 #include "chrome/browser/chromeos/login/view_screen.h" | 16 #include "chrome/browser/chromeos/login/view_screen.h" |
| 18 #include "chrome/browser/chromeos/login/views_oobe_display.h" | |
| 19 #include "chrome/browser/chromeos/login/wizard_controller.h" | 17 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 20 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" | 18 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" |
| 21 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
| 22 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
| 23 #include "testing/gmock/include/gmock/gmock.h" | 21 #include "testing/gmock/include/gmock/gmock.h" |
| 24 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
| 25 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
| 26 #include "unicode/locid.h" | 24 #include "unicode/locid.h" |
| 27 #include "views/accelerator.h" | 25 #include "views/accelerator.h" |
| 28 | 26 |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 241 } | 239 } |
| 242 #endif | 240 #endif |
| 243 | 241 |
| 244 #if defined(OFFICIAL_BUILD) | 242 #if defined(OFFICIAL_BUILD) |
| 245 // This test is supposed to fail on official build. | 243 // This test is supposed to fail on official build. |
| 246 #define MAYBE_Accelerators DISABLED_Accelerators | 244 #define MAYBE_Accelerators DISABLED_Accelerators |
| 247 #else | 245 #else |
| 248 #define MAYBE_Accelerators Accelerators | 246 #define MAYBE_Accelerators Accelerators |
| 249 #endif | 247 #endif |
| 250 | 248 |
| 251 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, MAYBE_Accelerators) { | 249 /*IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, MAYBE_Accelerators) { |
|
altimofeev
2011/11/07 11:07:09
nit: add TODO please
Nikita (slow)
2011/11/07 11:27:43
Done.
| |
| 252 //TODO(altimofeev): do not depend on the display realization. | 250 //TODO(altimofeev): do not depend on the display realization. |
| 253 | 251 |
| 254 ViewsOobeDisplay* display = | 252 ViewsOobeDisplay* display = |
| 255 static_cast<ViewsOobeDisplay*>(controller()->oobe_display_); | 253 static_cast<ViewsOobeDisplay*>(controller()->oobe_display_); |
| 256 views::View* contents = display->contents_; | 254 views::View* contents = display->contents_; |
| 257 | 255 |
| 258 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); | 256 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); |
| 259 | 257 |
| 260 views::Accelerator accel_network_screen(ui::VKEY_N, false, true, true); | 258 views::Accelerator accel_network_screen(ui::VKEY_N, false, true, true); |
| 261 views::Accelerator accel_update_screen(ui::VKEY_U, false, true, true); | 259 views::Accelerator accel_update_screen(ui::VKEY_U, false, true, true); |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 288 | 286 |
| 289 focus_manager = contents->GetFocusManager(); | 287 focus_manager = contents->GetFocusManager(); |
| 290 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); | 288 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); |
| 291 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen)); | 289 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen)); |
| 292 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); | 290 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); |
| 293 | 291 |
| 294 focus_manager = contents->GetFocusManager(); | 292 focus_manager = contents->GetFocusManager(); |
| 295 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); | 293 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); |
| 296 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen)); | 294 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen)); |
| 297 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen()); | 295 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen()); |
| 298 } | 296 }*/ |
| 299 | 297 |
| 300 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15, | 298 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15, |
| 301 add_tests_for_new_control_flow_you_just_introduced); | 299 add_tests_for_new_control_flow_you_just_introduced); |
| 302 | 300 |
| 303 } // namespace chromeos | 301 } // namespace chromeos |
| OLD | NEW |