OLD | NEW |
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/chromeos/login/screen_locker.h" | 5 #include "chrome/browser/chromeos/login/screen_locker.h" |
6 | 6 |
7 #include <X11/extensions/XTest.h> | 7 #include <X11/extensions/XTest.h> |
8 #include <X11/keysym.h> | 8 #include <X11/keysym.h> |
9 #include <gdk/gdkkeysyms.h> | 9 #include <gdk/gdkkeysyms.h> |
10 #include <gdk/gdkx.h> | 10 #include <gdk/gdkx.h> |
11 #include <string> | 11 #include <string> |
12 #include <vector> | 12 #include <vector> |
13 // Evil hack to undo X11 evil #define. See crosbug.com/ | 13 // Evil hack to undo X11 evil #define. See crosbug.com/ |
14 #undef Status | 14 #undef Status |
15 | 15 |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "base/lazy_instance.h" | 17 #include "base/lazy_instance.h" |
18 #include "base/message_loop.h" | 18 #include "base/message_loop.h" |
19 #include "base/metrics/histogram.h" | 19 #include "base/metrics/histogram.h" |
20 #include "base/string_util.h" | 20 #include "base/string_util.h" |
21 #include "base/timer.h" | 21 #include "base/timer.h" |
22 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
| 23 #include "chrome/browser/chromeos/cros/cros_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/input_method/input_method_manager.h" | 26 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
26 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 27 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
27 #include "chrome/browser/chromeos/language_preferences.h" | 28 #include "chrome/browser/chromeos/language_preferences.h" |
28 #include "chrome/browser/chromeos/login/authenticator.h" | 29 #include "chrome/browser/chromeos/login/authenticator.h" |
29 #include "chrome/browser/chromeos/login/background_view.h" | 30 #include "chrome/browser/chromeos/login/background_view.h" |
30 #include "chrome/browser/chromeos/login/login_performer.h" | 31 #include "chrome/browser/chromeos/login/login_performer.h" |
31 #include "chrome/browser/chromeos/login/login_utils.h" | 32 #include "chrome/browser/chromeos/login/login_utils.h" |
32 #include "chrome/browser/chromeos/login/message_bubble.h" | 33 #include "chrome/browser/chromeos/login/message_bubble.h" |
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1226 | 1227 |
1227 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) { | 1228 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) { |
1228 if (!background_view_->IsScreenSaverVisible()) { | 1229 if (!background_view_->IsScreenSaverVisible()) { |
1229 StartScreenSaver(); | 1230 StartScreenSaver(); |
1230 return true; | 1231 return true; |
1231 } | 1232 } |
1232 return false; | 1233 return false; |
1233 } | 1234 } |
1234 | 1235 |
1235 } // namespace chromeos | 1236 } // namespace chromeos |
OLD | NEW |