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

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

Issue 1411423006: Simplifed logic of showing/hiding cancel buttons on login screens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Created 5 years, 1 month 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"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 input_method::InputMethodManager::Get() 261 input_method::InputMethodManager::Get()
262 ->GetActiveIMEState() 262 ->GetActiveIMEState()
263 ->GetActiveInputMethodIds()); 263 ->GetActiveInputMethodIds());
264 264
265 // Switch to Gaia. 265 // Switch to Gaia.
266 js_checker().Evaluate("$('add-user-button').click()"); 266 js_checker().Evaluate("$('add-user-button').click()");
267 OobeScreenWaiter(OobeDisplay::SCREEN_GAIA_SIGNIN).Wait(); 267 OobeScreenWaiter(OobeDisplay::SCREEN_GAIA_SIGNIN).Wait();
268 CheckGaiaKeyboard(); 268 CheckGaiaKeyboard();
269 269
270 // Switch back. 270 // Switch back.
271 js_checker().Evaluate("$('cancel-add-user-button').click()"); 271 js_checker().Evaluate("$('gaia-signin').cancel()");
272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); 272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
273 273
274 EXPECT_EQ(expected_input_methods, 274 EXPECT_EQ(expected_input_methods,
275 input_method::InputMethodManager::Get() 275 input_method::InputMethodManager::Get()
276 ->GetActiveIMEState() 276 ->GetActiveIMEState()
277 ->GetActiveInputMethodIds()); 277 ->GetActiveInputMethodIds());
278 } 278 }
279 } // namespace chromeos 279 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698