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

Side by Side Diff: chrome/browser/chromeos/login/login_ui_keyboard_browsertest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" 8 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
9 #include "chrome/browser/chromeos/language_preferences.h" 9 #include "chrome/browser/chromeos/language_preferences.h"
10 #include "chrome/browser/chromeos/login/login_manager_test.h" 10 #include "chrome/browser/chromeos/login/login_manager_test.h"
11 #include "chrome/browser/chromeos/login/startup_utils.h" 11 #include "chrome/browser/chromeos/login/startup_utils.h"
12 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 12 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
13 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 13 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
14 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 14 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chromeos/chromeos_switches.h" 16 #include "chromeos/chromeos_switches.h"
17 #include "content/public/test/test_utils.h" 17 #include "content/public/test/test_utils.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 namespace { 21 namespace {
22 22
23 const char kTestUser1[] = "test-user1@gmail.com"; 23 const char kTestUser1[] = "test-user1@gmail.com";
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 return; 65 return;
66 runner_->Run(); 66 runner_->Run();
67 GetOobeUI() 67 GetOobeUI()
68 ->signin_screen_handler_for_test() 68 ->signin_screen_handler_for_test()
69 ->SetFocusPODCallbackForTesting(base::Closure()); 69 ->SetFocusPODCallbackForTesting(base::Closure());
70 runner_ = NULL; 70 runner_ = NULL;
71 } 71 }
72 72
73 private: 73 private:
74 OobeUI* GetOobeUI() { 74 OobeUI* GetOobeUI() {
75 OobeUI* oobe_ui = 75 OobeUI* oobe_ui = LoginDisplayHost::default_host()->GetOobeUI();
76 static_cast<chromeos::LoginDisplayHostImpl*>(
77 chromeos::LoginDisplayHostImpl::default_host())->GetOobeUI();
78 CHECK(oobe_ui); 76 CHECK(oobe_ui);
79 return oobe_ui; 77 return oobe_ui;
80 } 78 }
81 79
82 bool focused_; 80 bool focused_;
83 81
84 scoped_refptr<content::MessageLoopRunner> runner_; 82 scoped_refptr<content::MessageLoopRunner> runner_;
85 }; 83 };
86 84
87 } // anonymous namespace 85 } // anonymous namespace
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // Switch back. 270 // Switch back.
273 js_checker().Evaluate("$('gaia-signin').cancel()"); 271 js_checker().Evaluate("$('gaia-signin').cancel()");
274 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); 272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
275 273
276 EXPECT_EQ(expected_input_methods, 274 EXPECT_EQ(expected_input_methods,
277 input_method::InputMethodManager::Get() 275 input_method::InputMethodManager::Get()
278 ->GetActiveIMEState() 276 ->GetActiveIMEState()
279 ->GetActiveInputMethodIds()); 277 ->GetActiveInputMethodIds());
280 } 278 }
281 } // namespace chromeos 279 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_manager_test.cc ('k') | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698