chrome/browser/chromeos/login/screen_locker.cc - Issue 3436031: [Chrome OS] Refactor Canonicalize() method into base class to prepare for new Authenticator subclass

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

Issue 3436031: [Chrome OS] Refactor Canonicalize() method into base class to prepare for new Authenticator subclass (Closed)

Patch Set: aaaaand fix one more header Created 10 years, 2 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

« chrome/browser/chromeos/login/authenticator.h ('K') | « chrome/browser/chromeos/login/mock_authenticator.h ('k') | chrome/browser/chromeos/login/user_image_downloader.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 (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/screen_locker.h"	5 #include "chrome/browser/chromeos/login/screen_locker.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "app/l10n_util.h"	10 #include "app/l10n_util.h"

11 #include "app/resource_bundle.h"	11 #include "app/resource_bundle.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/message_loop.h"	13 #include "base/message_loop.h"

14 #include "base/singleton.h"	14 #include "base/singleton.h"

15 #include "base/string_util.h"	15 #include "base/string_util.h"

16 #include "base/timer.h"	16 #include "base/timer.h"

17 #include "base/utf_string_conversions.h"	17 #include "base/utf_string_conversions.h"

18 #include "chrome/browser/browser.h"	18 #include "chrome/browser/browser.h"

19 #include "chrome/browser/browser_list.h"	19 #include "chrome/browser/browser_list.h"

20 #include "chrome/browser/browser_window.h"	20 #include "chrome/browser/browser_window.h"

	21 #include "chrome/browser/chrome_thread.h"

21 #include "chrome/browser/chromeos/cros/input_method_library.h"	22 #include "chrome/browser/chromeos/cros/input_method_library.h"

22 #include "chrome/browser/chromeos/cros/keyboard_library.h"	23 #include "chrome/browser/chromeos/cros/keyboard_library.h"

23 #include "chrome/browser/chromeos/cros/login_library.h"	24 #include "chrome/browser/chromeos/cros/login_library.h"

24 #include "chrome/browser/chromeos/cros/screen_lock_library.h"	25 #include "chrome/browser/chromeos/cros/screen_lock_library.h"

25 #include "chrome/browser/chromeos/language_preferences.h"	26 #include "chrome/browser/chromeos/language_preferences.h"

26 #include "chrome/browser/chromeos/login/authenticator.h"	27 #include "chrome/browser/chromeos/login/authenticator.h"

27 #include "chrome/browser/chromeos/login/background_view.h"	28 #include "chrome/browser/chromeos/login/background_view.h"

28 #include "chrome/browser/chromeos/login/login_utils.h"	29 #include "chrome/browser/chromeos/login/login_utils.h"

29 #include "chrome/browser/chromeos/login/message_bubble.h"	30 #include "chrome/browser/chromeos/login/message_bubble.h"

30 #include "chrome/browser/chromeos/login/screen_lock_view.h"	31 #include "chrome/browser/chromeos/login/screen_lock_view.h"

(...skipping 796 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
827	828

828 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {	829 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {

829 if (!background_view_->IsScreenSaverVisible()) {	830 if (!background_view_->IsScreenSaverVisible()) {

830 StartScreenSaver();	831 StartScreenSaver();

831 return true;	832 return true;

832 }	833 }

833 return false;	834 return false;

834 }	835 }

835	836

836 } // namespace chromeos	837 } // namespace chromeos

OLD	NEW