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

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More IWYU, missing link-time dependency for Chrome Frame. 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/screen_locker_webui.h" 5 #include "chrome/browser/chromeos/login/screen_locker_webui.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/login/screen_locker.h" 10 #include "chrome/browser/chromeos/login/screen_locker.h"
20 #include "chrome/browser/chromeos/wm_ipc.h" 11 #include "chrome/browser/chromeos/wm_ipc.h"
21 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
22 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/x/x11_util.h" 14 #include "ui/base/x/x11_util.h"
24 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
25 #include "views/widget/native_widget_gtk.h" 16 #include "views/widget/native_widget_gtk.h"
26 17
18 // These conflict with base/tracked_objects.h, so must come last.
19 #include <X11/extensions/XTest.h>
20 #include <X11/keysym.h>
21 #include <gdk/gdkkeysyms.h>
22 #include <gdk/gdkx.h>
23
27 namespace { 24 namespace {
28 25
29 chromeos::ScreenLockerWebUI* screen_locker_webui_ = NULL; 26 chromeos::ScreenLockerWebUI* screen_locker_webui_ = NULL;
30 27
31 // A ScreenLock window that covers entire screen to keep the keyboard 28 // A ScreenLock window that covers entire screen to keep the keyboard
32 // focus/events inside the grab widget. 29 // focus/events inside the grab widget.
33 class LockWindow : public views::NativeWidgetGtk { 30 class LockWindow : public views::NativeWidgetGtk {
34 public: 31 public:
35 LockWindow() 32 LockWindow()
36 : views::NativeWidgetGtk(new views::Widget), 33 : views::NativeWidgetGtk(new views::Widget),
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 333
337 void ScreenLockWebUI::HandleKeyboardEvent( 334 void ScreenLockWebUI::HandleKeyboardEvent(
338 const NativeWebKeyboardEvent& event) { 335 const NativeWebKeyboardEvent& event) {
339 // Override WebUILoginView::HandleKeyboardEvent to prevent call to WebUI 336 // Override WebUILoginView::HandleKeyboardEvent to prevent call to WebUI
340 // cr.ui.Oobe functions. 337 // cr.ui.Oobe functions.
341 // TODO(flackr): This might be able to be removed once merging with the login 338 // TODO(flackr): This might be able to be removed once merging with the login
342 // screen WebUI is complete. 339 // screen WebUI is complete.
343 } 340 }
344 341
345 } // namespace chromeos 342 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698