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

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

Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/webui_login_display.h" 5 #include "chrome/browser/chromeos/login/webui_login_display.h"
6 6
7 #include "ash/wm/user_activity_detector.h" 7 #include "ash/wm/user_activity_detector.h"
8 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 8 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
9 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 9 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 10 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
11 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
12 #include "chrome/browser/chromeos/login/screen_locker.h" 11 #include "chrome/browser/chromeos/login/screen_locker.h"
13 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 12 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
14 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 13 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
15 #include "chrome/browser/chromeos/login/webui_login_view.h" 14 #include "chrome/browser/chromeos/login/webui_login_view.h"
16 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #include "chromeos/ime/xkeyboard.h"
18 #include "grit/chromium_strings.h" 18 #include "grit/chromium_strings.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 namespace { 25 namespace {
26 26
27 const int kPasswordClearTimeoutSec = 60; 27 const int kPasswordClearTimeoutSec = 60;
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this, 350 base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this,
351 &WebUILoginDisplay::OnPasswordClearTimerExpired); 351 &WebUILoginDisplay::OnPasswordClearTimerExpired);
352 } 352 }
353 353
354 void WebUILoginDisplay::OnPasswordClearTimerExpired() { 354 void WebUILoginDisplay::OnPasswordClearTimerExpired() {
355 if (webui_handler_) 355 if (webui_handler_)
356 webui_handler_->ClearUserPodPassword(); 356 webui_handler_->ClearUserPodPassword();
357 } 357 }
358 358
359 } // namespace chromeos 359 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/xkeyboard_unittest.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698