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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 8356040: Reapply Caps Lock and Num Lock to core keyboard whenever new X input device is added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit_tests Created 9 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 | Annotate | Revision Log
OLDNEW
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/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/task.h" 13 #include "base/task.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/browser_shutdown.h" 16 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
18 #include "chrome/browser/chromeos/cros/network_library.h" 18 #include "chrome/browser/chromeos/cros/network_library.h"
19 #include "chrome/browser/chromeos/cros/power_library.h" 19 #include "chrome/browser/chromeos/cros/power_library.h"
20 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
20 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 21 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
21 #include "chrome/browser/chromeos/login/user_manager.h" 22 #include "chrome/browser/chromeos/login/user_manager.h"
22 #include "chrome/browser/chromeos/login/webui_login_display.h" 23 #include "chrome/browser/chromeos/login/webui_login_display.h"
23 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 24 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
24 #include "chrome/browser/io_thread.h" 25 #include "chrome/browser/io_thread.h"
25 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/common/chrome_notification_types.h" 27 #include "chrome/common/chrome_notification_types.h"
27 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/net/gaia/gaia_urls.h" 29 #include "chrome/common/net/gaia/gaia_urls.h"
29 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 299
299 if (oobe_ui) { 300 if (oobe_ui) {
300 // Shows new user sign-in for OOBE. 301 // Shows new user sign-in for OOBE.
301 HandleShowAddUser(NULL); 302 HandleShowAddUser(NULL);
302 } else { 303 } else {
303 // Populates account picker. Animation is turned off for now until we 304 // Populates account picker. Animation is turned off for now until we
304 // figure out how to make it fast enough. 305 // figure out how to make it fast enough.
305 SendUserList(false); 306 SendUserList(false);
306 307
307 // Reset Caps Lock state when login screen is shown. 308 // Reset Caps Lock state when login screen is shown.
308 input_method::XKeyboard::SetCapsLockEnabled(false); 309 input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
310 SetCapsLockEnabled(false);
309 311
310 ShowScreen(kAccountPickerScreen, NULL); 312 ShowScreen(kAccountPickerScreen, NULL);
311 } 313 }
312 } 314 }
313 315
314 void SigninScreenHandler::SetDelegate(SigninScreenHandlerDelegate* delegate) { 316 void SigninScreenHandler::SetDelegate(SigninScreenHandlerDelegate* delegate) {
315 delegate_ = delegate; 317 delegate_ = delegate;
316 DCHECK(delegate_); 318 DCHECK(delegate_);
317 delegate_->SetWebUIHandler(this); 319 delegate_->SetWebUIHandler(this);
318 } 320 }
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 694
693 cookie_remover_ = new BrowsingDataRemover( 695 cookie_remover_ = new BrowsingDataRemover(
694 Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()), 696 Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
695 BrowsingDataRemover::EVERYTHING, 697 BrowsingDataRemover::EVERYTHING,
696 base::Time()); 698 base::Time());
697 cookie_remover_->AddObserver(this); 699 cookie_remover_->AddObserver(this);
698 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA); 700 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
699 } 701 }
700 702
701 } // namespace chromeos 703 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698