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

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: With this patchset, Chrome runs and exits normally on Linux. Created 9 years, 1 month 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/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
6 6
7 #include <X11/extensions/XTest.h>
8 #include <X11/keysym.h>
9 #include <gdk/gdkkeysyms.h>
10 #include <gdk/gdkx.h>
11
12 // Evil hack to undo X11 evil #define.
13 #undef None
14 #undef Status
15
16 #include "base/command_line.h" 7 #include "base/command_line.h"
17 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
18 #include "base/values.h" 9 #include "base/values.h"
19 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
20 #include "chrome/browser/chromeos/cros/network_library.h" 11 #include "chrome/browser/chromeos/cros/network_library.h"
21 #include "chrome/browser/chromeos/login/helper.h" 12 #include "chrome/browser/chromeos/login/helper.h"
22 #include "chrome/browser/chromeos/login/screen_locker.h" 13 #include "chrome/browser/chromeos/login/screen_locker.h"
23 #include "chrome/browser/chromeos/login/user_manager.h" 14 #include "chrome/browser/chromeos/login/user_manager.h"
24 #include "chrome/browser/chromeos/login/webui_login_display.h" 15 #include "chrome/browser/chromeos/login/webui_login_display.h"
25 #include "chrome/browser/chromeos/wm_ipc.h" 16 #include "chrome/browser/chromeos/wm_ipc.h"
26 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 17 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
27 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
28 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/notification_service.h" 20 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/notification_types.h" 21 #include "content/public/browser/notification_types.h"
31 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/x/x11_util.h" 23 #include "ui/base/x/x11_util.h"
33 #include "ui/gfx/screen.h" 24 #include "ui/gfx/screen.h"
34 #include "views/widget/native_widget_gtk.h" 25 #include "views/widget/native_widget_gtk.h"
35 26
27 // These conflict with some of the Chrome headers, so must be included last.
28 #include <X11/extensions/XTest.h>
29 #include <X11/keysym.h>
30 #include <gdk/gdkkeysyms.h>
31 #include <gdk/gdkx.h>
32
36 namespace { 33 namespace {
37 34
38 // URL which corresponds to the login WebUI. 35 // URL which corresponds to the login WebUI.
39 const char kLoginURL[] = "chrome://oobe/login"; 36 const char kLoginURL[] = "chrome://oobe/login";
40 37
41 // A ScreenLock window that covers entire screen to keep the keyboard 38 // A ScreenLock window that covers entire screen to keep the keyboard
42 // focus/events inside the grab widget. 39 // focus/events inside the grab widget.
43 class LockWindow : public views::NativeWidgetGtk { 40 class LockWindow : public views::NativeWidgetGtk {
44 public: 41 public:
45 LockWindow() 42 LockWindow()
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 } 257 }
261 258
262 void WebUIScreenLocker::OnUserSelected(const std::string& username) { 259 void WebUIScreenLocker::OnUserSelected(const std::string& username) {
263 } 260 }
264 261
265 void WebUIScreenLocker::OnStartEnterpriseEnrollment() { 262 void WebUIScreenLocker::OnStartEnterpriseEnrollment() {
266 NOTREACHED(); 263 NOTREACHED();
267 } 264 }
268 265
269 } // namespace chromeos 266 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698