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

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

Issue 8539051: aura: Touch state file after first browser is ready. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update more includes 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_views.h" 5 #include "chrome/browser/chromeos/login/screen_locker_views.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>
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/prefs/pref_service.h" 26 #include "chrome/browser/prefs/pref_service.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
29 #include "content/browser/user_metrics.h" 29 #include "content/browser/user_metrics.h"
30 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
31 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
32 #include "ui/base/x/x11_util.h" 32 #include "ui/base/x/x11_util.h"
33 #include "ui/gfx/screen.h" 33 #include "ui/gfx/screen.h"
34 34
35 #if defined(TOOLKIT_USES_GTK) 35 #if defined(TOOLKIT_USES_GTK)
36 #include "chrome/browser/chromeos/wm_ipc.h" 36 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
37 #endif 37 #endif
38 38
39 namespace { 39 namespace {
40 40
41 // The active ScreenLockerDelegate. 41 // The active ScreenLockerDelegate.
42 chromeos::ScreenLockerViews* screen_locker_view_ = NULL; 42 chromeos::ScreenLockerViews* screen_locker_view_ = NULL;
43 43
44 // The maximum duration for which locker should try to grab the keyboard and 44 // The maximum duration for which locker should try to grab the keyboard and
45 // mouse and its interval for regrabbing on failure. 45 // mouse and its interval for regrabbing on failure.
46 const int kMaxGrabFailureSec = 30; 46 const int kMaxGrabFailureSec = 30;
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 #if defined(TOOLKIT_USES_GTK) 925 #if defined(TOOLKIT_USES_GTK)
926 WmIpc::Message msg; 926 WmIpc::Message msg;
927 WmIpc::instance()->DecodeMessage(*event, &msg); 927 WmIpc::instance()->DecodeMessage(*event, &msg);
928 if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_SCREEN_REDRAWN_FOR_LOCK) { 928 if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_SCREEN_REDRAWN_FOR_LOCK) {
929 OnWindowManagerReady(); 929 OnWindowManagerReady();
930 } 930 }
931 #endif 931 #endif
932 } 932 }
933 933
934 } // namespace chromeos 934 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/chromeos/login/user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698