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

Side by Side Diff: src/platform/window_manager/key_bindings.cc

Issue 501116: wm: Update namespace and header define guards. (Closed)
Patch Set: move using directive inside of namespace for consistency Created 11 years 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
OLDNEW
1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium OS 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 "window_manager/key_bindings.h" 5 #include "window_manager/key_bindings.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 extern "C" { 9 extern "C" {
10 #include <X11/Xutil.h> 10 #include <X11/Xutil.h>
11 } 11 }
12 #include <gflags/gflags.h> 12 #include <gflags/gflags.h>
13 13
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "chromeos/obsolete_logging.h" 16 #include "chromeos/obsolete_logging.h"
17 #include "window_manager/x_connection.h" 17 #include "window_manager/x_connection.h"
18 18
19 namespace chromeos { 19 namespace window_manager {
20
21 using chromeos::Closure;
20 22
21 bool KeyBindings::KeyComboComparator::operator()(const KeyCombo& a, 23 bool KeyBindings::KeyComboComparator::operator()(const KeyCombo& a,
22 const KeyCombo& b) const { 24 const KeyCombo& b) const {
23 return (a.key < b.key) || 25 return (a.key < b.key) ||
24 ((a.key == b.key) && (a.modifiers < b.modifiers)); 26 ((a.key == b.key) && (a.modifiers < b.modifiers));
25 } 27 }
26 28
27 struct Action { 29 struct Action {
28 Action(Closure* begin_closure_param, 30 Action(Closure* begin_closure_param,
29 Closure* repeat_closure_param, 31 Closure* repeat_closure_param,
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 case XK_Super_L: 226 case XK_Super_L:
225 case XK_Super_R: 227 case XK_Super_R:
226 return kSuperMask; 228 return kSuperMask;
227 case XK_Hyper_L: 229 case XK_Hyper_L:
228 case XK_Hyper_R: 230 case XK_Hyper_R:
229 return kHyperMask; 231 return kHyperMask;
230 } 232 }
231 return 0; 233 return 0;
232 } 234 }
233 235
234 } // namespace chromeos 236 } // namespace window_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698