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

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

Issue 7648043: Include chromeos_wm_ipc_enums.h from third_party/cros_system_api. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix check_deps failure Created 9 years, 4 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 <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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/ui/browser_list.h" 43 #include "chrome/browser/ui/browser_list.h"
44 #include "chrome/browser/ui/browser_window.h" 44 #include "chrome/browser/ui/browser_window.h"
45 #include "chrome/common/chrome_notification_types.h" 45 #include "chrome/common/chrome_notification_types.h"
46 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
47 #include "content/browser/browser_thread.h" 47 #include "content/browser/browser_thread.h"
48 #include "content/browser/user_metrics.h" 48 #include "content/browser/user_metrics.h"
49 #include "content/common/notification_service.h" 49 #include "content/common/notification_service.h"
50 #include "googleurl/src/gurl.h" 50 #include "googleurl/src/gurl.h"
51 #include "grit/generated_resources.h" 51 #include "grit/generated_resources.h"
52 #include "grit/theme_resources.h" 52 #include "grit/theme_resources.h"
53 #include "third_party/cros/chromeos_wm_ipc_enums.h" 53 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
54 #include "ui/base/l10n/l10n_util.h" 54 #include "ui/base/l10n/l10n_util.h"
55 #include "ui/base/resource/resource_bundle.h" 55 #include "ui/base/resource/resource_bundle.h"
56 #include "ui/base/x/x11_util.h" 56 #include "ui/base/x/x11_util.h"
57 #include "ui/gfx/screen.h" 57 #include "ui/gfx/screen.h"
58 #include "views/widget/native_widget_gtk.h" 58 #include "views/widget/native_widget_gtk.h"
59 59
60 namespace { 60 namespace {
61 61
62 // The maximum duration for which locker should try to grab the keyboard and 62 // The maximum duration for which locker should try to grab the keyboard and
63 // mouse and its interval for regrabbing on failure. 63 // mouse and its interval for regrabbing on failure.
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 1227
1228 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) { 1228 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {
1229 if (!background_view_->IsScreenSaverVisible()) { 1229 if (!background_view_->IsScreenSaverVisible()) {
1230 StartScreenSaver(); 1230 StartScreenSaver();
1231 return true; 1231 return true;
1232 } 1232 }
1233 return false; 1233 return false;
1234 } 1234 }
1235 1235
1236 } // namespace chromeos 1236 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/base_login_display_host.cc ('k') | chrome/browser/chromeos/login/user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698