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

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

Issue 6594063: Update a bunch of files to the new location of browser_thread.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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) 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 <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 #include <X11/extensions/XTest.h> 11 #include <X11/extensions/XTest.h>
12 #include <X11/keysym.h> 12 #include <X11/keysym.h>
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/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/message_loop.h" 19 #include "base/message_loop.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/browser_list.h" 23 #include "chrome/browser/browser_list.h"
24 #include "chrome/browser/browser_thread.h"
25 #include "chrome/browser/browser_window.h" 24 #include "chrome/browser/browser_window.h"
26 #include "chrome/browser/chromeos/cros/input_method_library.h" 25 #include "chrome/browser/chromeos/cros/input_method_library.h"
27 #include "chrome/browser/chromeos/cros/keyboard_library.h" 26 #include "chrome/browser/chromeos/cros/keyboard_library.h"
28 #include "chrome/browser/chromeos/cros/login_library.h" 27 #include "chrome/browser/chromeos/cros/login_library.h"
29 #include "chrome/browser/chromeos/cros/screen_lock_library.h" 28 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
30 #include "chrome/browser/chromeos/input_method/input_method_util.h" 29 #include "chrome/browser/chromeos/input_method/input_method_util.h"
31 #include "chrome/browser/chromeos/language_preferences.h" 30 #include "chrome/browser/chromeos/language_preferences.h"
32 #include "chrome/browser/chromeos/login/authenticator.h" 31 #include "chrome/browser/chromeos/login/authenticator.h"
33 #include "chrome/browser/chromeos/login/background_view.h" 32 #include "chrome/browser/chromeos/login/background_view.h"
34 #include "chrome/browser/chromeos/login/login_performer.h" 33 #include "chrome/browser/chromeos/login/login_performer.h"
35 #include "chrome/browser/chromeos/login/login_utils.h" 34 #include "chrome/browser/chromeos/login/login_utils.h"
36 #include "chrome/browser/chromeos/login/message_bubble.h" 35 #include "chrome/browser/chromeos/login/message_bubble.h"
37 #include "chrome/browser/chromeos/login/screen_lock_view.h" 36 #include "chrome/browser/chromeos/login/screen_lock_view.h"
38 #include "chrome/browser/chromeos/login/shutdown_button.h" 37 #include "chrome/browser/chromeos/login/shutdown_button.h"
39 #include "chrome/browser/chromeos/system_key_event_listener.h" 38 #include "chrome/browser/chromeos/system_key_event_listener.h"
40 #include "chrome/browser/chromeos/wm_ipc.h" 39 #include "chrome/browser/chromeos/wm_ipc.h"
41 #include "chrome/browser/chromeos/view_ids.h" 40 #include "chrome/browser/chromeos/view_ids.h"
42 #include "chrome/browser/metrics/user_metrics.h" 41 #include "chrome/browser/metrics/user_metrics.h"
43 #include "chrome/browser/profiles/profile_manager.h" 42 #include "chrome/browser/profiles/profile_manager.h"
44 #include "chrome/browser/sync/profile_sync_service.h" 43 #include "chrome/browser/sync/profile_sync_service.h"
45 #include "chrome/browser/ui/browser.h" 44 #include "chrome/browser/ui/browser.h"
46 #include "chrome/common/chrome_switches.h" 45 #include "chrome/common/chrome_switches.h"
47 #include "chrome/common/notification_service.h" 46 #include "chrome/common/notification_service.h"
47 #include "content/browser/browser_thread.h"
48 #include "googleurl/src/gurl.h" 48 #include "googleurl/src/gurl.h"
49 #include "grit/generated_resources.h" 49 #include "grit/generated_resources.h"
50 #include "grit/theme_resources.h" 50 #include "grit/theme_resources.h"
51 #include "third_party/cros/chromeos_wm_ipc_enums.h" 51 #include "third_party/cros/chromeos_wm_ipc_enums.h"
52 #include "ui/base/l10n/l10n_util.h" 52 #include "ui/base/l10n/l10n_util.h"
53 #include "ui/base/resource/resource_bundle.h" 53 #include "ui/base/resource/resource_bundle.h"
54 #include "ui/base/x/x11_util.h" 54 #include "ui/base/x/x11_util.h"
55 #include "views/screen.h" 55 #include "views/screen.h"
56 #include "views/widget/root_view.h" 56 #include "views/widget/root_view.h"
57 #include "views/widget/widget_gtk.h" 57 #include "views/widget/widget_gtk.h"
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 1154
1155 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) { 1155 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {
1156 if (!background_view_->IsScreenSaverVisible()) { 1156 if (!background_view_->IsScreenSaverVisible()) {
1157 StartScreenSaver(); 1157 StartScreenSaver();
1158 return true; 1158 return true;
1159 } 1159 }
1160 return false; 1160 return false;
1161 } 1161 }
1162 1162
1163 } // namespace chromeos 1163 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/parallel_authenticator.cc ('k') | chrome/browser/chromeos/login/signed_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698