| 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 "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" | 5 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "chrome/browser/chromeos/login/base_login_display_host.h" | 8 #include "chrome/browser/chromeos/login/base_login_display_host.h" |
| 9 #include "chrome/browser/chromeos/login/wizard_controller.h" | 9 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 browser::ShowLoginWizard(screen_name_.c_str(), gfx::Size(1024, 600)); | 29 browser::ShowLoginWizard(screen_name_.c_str(), gfx::Size(1024, 600)); |
| 30 controller_ = WizardController::default_controller(); | 30 controller_ = WizardController::default_controller(); |
| 31 host_ = BaseLoginDisplayHost::default_host(); | 31 host_ = BaseLoginDisplayHost::default_host(); |
| 32 } | 32 } |
| 33 return NULL; | 33 return NULL; |
| 34 } | 34 } |
| 35 | 35 |
| 36 void WizardInProcessBrowserTest::CleanUpOnMainThread() { | 36 void WizardInProcessBrowserTest::CleanUpOnMainThread() { |
| 37 ui_test_utils::WindowedNotificationObserver wizard_destroyed_observer( | 37 ui_test_utils::WindowedNotificationObserver wizard_destroyed_observer( |
| 38 chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED, | 38 chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED, |
| 39 NotificationService::AllSources()); | 39 content::NotificationService::AllSources()); |
| 40 | 40 |
| 41 // LoginDisplayHost owns controllers and all windows. | 41 // LoginDisplayHost owns controllers and all windows. |
| 42 MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); | 42 MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); |
| 43 | 43 |
| 44 // Observers and what not are notified after the views are deleted, which | 44 // Observers and what not are notified after the views are deleted, which |
| 45 // happens after a delay (because they are contained in a NativeWidgetGtk | 45 // happens after a delay (because they are contained in a NativeWidgetGtk |
| 46 // which delays deleting itself). Run the message loop until we know the | 46 // which delays deleting itself). Run the message loop until we know the |
| 47 // wizard has been deleted. | 47 // wizard has been deleted. |
| 48 wizard_destroyed_observer.Wait(); | 48 wizard_destroyed_observer.Wait(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace chromeos | 51 } // namespace chromeos |
| OLD | NEW |