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

Side by Side Diff: chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc

Issue 2052603002: Restore calls to MessageLoopForUI::current in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add missing includes Created 4 years, 6 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/location.h" 6 #include "base/location.h"
7 #include "base/message_loop/message_loop.h"
7 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
8 #include "base/threading/thread_task_runner_handle.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" 10 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
11 #include "chrome/browser/chromeos/language_preferences.h" 11 #include "chrome/browser/chromeos/language_preferences.h"
12 #include "chrome/browser/chromeos/login/login_manager_test.h" 12 #include "chrome/browser/chromeos/login/login_manager_test.h"
13 #include "chrome/browser/chromeos/login/startup_utils.h" 13 #include "chrome/browser/chromeos/login/startup_utils.h"
14 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 14 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
15 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 15 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
16 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 16 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chromeos/chromeos_switches.h" 18 #include "chromeos/chromeos_switches.h"
(...skipping 30 matching lines...) Expand all
49 } 49 }
50 ~FocusPODWaiter() { 50 ~FocusPODWaiter() {
51 GetOobeUI() 51 GetOobeUI()
52 ->signin_screen_handler_for_test() 52 ->signin_screen_handler_for_test()
53 ->SetFocusPODCallbackForTesting(base::Closure()); 53 ->SetFocusPODCallbackForTesting(base::Closure());
54 } 54 }
55 55
56 void OnFocusPOD() { 56 void OnFocusPOD() {
57 focused_ = true; 57 focused_ = true;
58 if (runner_.get()) 58 if (runner_.get())
59 base::ThreadTaskRunnerHandle::Get()->PostTask( 59 base::MessageLoopForUI::current()->task_runner()->PostTask(
60 FROM_HERE, 60 FROM_HERE,
61 base::Bind(&FocusPODWaiter::ExitMessageLoop, base::Unretained(this))); 61 base::Bind(&FocusPODWaiter::ExitMessageLoop, base::Unretained(this)));
62 } 62 }
63 63
64 void ExitMessageLoop() { runner_->Quit(); } 64 void ExitMessageLoop() { runner_->Quit(); }
65 65
66 void Wait() { 66 void Wait() {
67 if (focused_) 67 if (focused_)
68 return; 68 return;
69 runner_->Run(); 69 runner_->Run();
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 // Switch back. 274 // Switch back.
275 js_checker().Evaluate("$('gaia-signin').cancel()"); 275 js_checker().Evaluate("$('gaia-signin').cancel()");
276 OobeScreenWaiter(OobeScreen::SCREEN_ACCOUNT_PICKER).Wait(); 276 OobeScreenWaiter(OobeScreen::SCREEN_ACCOUNT_PICKER).Wait();
277 277
278 EXPECT_EQ(expected_input_methods, 278 EXPECT_EQ(expected_input_methods,
279 input_method::InputMethodManager::Get() 279 input_method::InputMethodManager::Get()
280 ->GetActiveIMEState() 280 ->GetActiveIMEState()
281 ->GetActiveInputMethodIds()); 281 ->GetActiveInputMethodIds());
282 } 282 }
283 } // namespace chromeos 283 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698