Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Side by Side Diff: chrome/browser/chromeos/login/test/oobe_screen_waiter.cc

Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-add-supervised-user
Patch Set: Address comments Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/chromeos/login/test/oobe_screen_waiter.h" 5 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
6 6
7 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 7 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
8 #include "content/public/test/test_utils.h" 8 #include "content/public/test/test_utils.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 namespace chromeos { 11 namespace chromeos {
12 12
13 OobeScreenWaiter::OobeScreenWaiter(OobeDisplay::Screen expected_screen) 13 OobeScreenWaiter::OobeScreenWaiter(OobeDisplay::Screen expected_screen)
14 : waiting_for_screen_(false), 14 : waiting_for_screen_(false),
15 expected_screen_(expected_screen) { 15 expected_screen_(expected_screen) {
16 } 16 }
17 17
(...skipping 25 matching lines...) Expand all
43 OobeDisplay::Screen current_screen, 43 OobeDisplay::Screen current_screen,
44 OobeDisplay::Screen new_screen) { 44 OobeDisplay::Screen new_screen) {
45 if (waiting_for_screen_ && new_screen == expected_screen_) { 45 if (waiting_for_screen_ && new_screen == expected_screen_) {
46 runner_->Quit(); 46 runner_->Quit();
47 waiting_for_screen_ = false; 47 waiting_for_screen_ = false;
48 GetOobeUI()->RemoveObserver(this); 48 GetOobeUI()->RemoveObserver(this);
49 } 49 }
50 } 50 }
51 51
52 OobeUI* OobeScreenWaiter::GetOobeUI() { 52 OobeUI* OobeScreenWaiter::GetOobeUI() {
53 OobeUI* oobe_ui = static_cast<chromeos::LoginDisplayHostImpl*>( 53 OobeUI* oobe_ui = LoginDisplayHost::default_host()->GetOobeUI();
54 chromeos::LoginDisplayHostImpl::default_host())->GetOobeUI();
55 CHECK(oobe_ui); 54 CHECK(oobe_ui);
56 return oobe_ui; 55 return oobe_ui;
57 } 56 }
58 57
59 } // namespace chromeos 58 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698