chrome/browser/chromeos/login/ui/webui_login_display.cc - Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

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

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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

« no previous file with comments | « chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/chromeos/login/ui/webui_login_display.h"	5 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"

6	6

7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

8 #include "chrome/browser/chromeos/login/lock/screen_locker.h"	8 #include "chrome/browser/chromeos/login/lock/screen_locker.h"

9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"	9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"

10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

11 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"	11 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"	12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

13 #include "chrome/browser/profiles/profile_manager.h"	13 #include "chrome/browser/profiles/profile_manager.h"

14 #include "chrome/browser/ui/browser_window.h"	14 #include "chrome/browser/ui/browser_window.h"

15 #include "chrome/grit/chromium_strings.h"	15 #include "chrome/grit/chromium_strings.h"

16 #include "chrome/grit/generated_resources.h"	16 #include "chrome/grit/generated_resources.h"

	17 #include "chromeos/ime/ime_keyboard.h"

	18 #include "chromeos/ime/input_method_manager.h"

17 #include "chromeos/login/user_names.h"	19 #include "chromeos/login/user_names.h"

18 #include "components/user_manager/user_manager.h"	20 #include "components/user_manager/user_manager.h"

19 #include "grit/components_strings.h"	21 #include "grit/components_strings.h"

20 #include "ui/base/ime/chromeos/ime_keyboard.h"

21 #include "ui/base/ime/chromeos/input_method_manager.h"

22 #include "ui/base/l10n/l10n_util.h"	22 #include "ui/base/l10n/l10n_util.h"

23 #include "ui/views/widget/widget.h"	23 #include "ui/views/widget/widget.h"

24 #include "ui/wm/core/user_activity_detector.h"	24 #include "ui/wm/core/user_activity_detector.h"

25	25

26 #if !defined(USE_ATHENA)	26 #if !defined(USE_ATHENA)

27 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"	27 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

28 #endif	28 #endif

29	29

30 namespace chromeos {	30 namespace chromeos {

31	31

(...skipping 324 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
356 delegate_->Signout();	356 delegate_->Signout();

357 }	357 }

358	358

359 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {	359 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {

360 if (delegate_)	360 if (delegate_)

361 delegate_->ResetPublicSessionAutoLoginTimer();	361 delegate_->ResetPublicSessionAutoLoginTimer();

362 }	362 }

363	363

364	364

365 } // namespace chromeos	365 } // namespace chromeos

OLD	NEW