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

Side by Side Diff: chrome/browser/ui/ash/event_rewriter.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/ash/event_rewriter.h" 5 #include "chrome/browser/ui/ash/event_rewriter.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/prefs/pref_service.h"
11 #include "base/string_util.h" 12 #include "base/string_util.h"
12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "ui/aura/root_window.h" 14 #include "ui/aura/root_window.h"
15 #include "ui/base/events/event.h" 15 #include "ui/base/events/event.h"
16 #include "ui/base/events/event_utils.h" 16 #include "ui/base/events/event_utils.h"
17 #include "ui/base/keycodes/keyboard_code_conversion.h" 17 #include "ui/base/keycodes/keyboard_code_conversion.h"
18 18
19 #if defined(OS_CHROMEOS) 19 #if defined(OS_CHROMEOS)
20 #include <X11/extensions/XInput2.h> 20 #include <X11/extensions/XInput2.h>
21 #include <X11/keysym.h> 21 #include <X11/keysym.h>
22 #include <X11/XF86keysym.h> 22 #include <X11/XF86keysym.h>
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 const DeviceType type = EventRewriter::GetDeviceType(device_name); 1014 const DeviceType type = EventRewriter::GetDeviceType(device_name);
1015 if (type == kDeviceAppleKeyboard) { 1015 if (type == kDeviceAppleKeyboard) {
1016 VLOG(1) << "Apple keyboard '" << device_name << "' connected: " 1016 VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
1017 << "id=" << device_id; 1017 << "id=" << device_id;
1018 } 1018 }
1019 // Always overwrite the existing device_id since the X server may reuse a 1019 // Always overwrite the existing device_id since the X server may reuse a
1020 // device id for an unattached device. 1020 // device id for an unattached device.
1021 device_id_to_type_[device_id] = type; 1021 device_id_to_type_[device_id] = type;
1022 return type; 1022 return type;
1023 } 1023 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698