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

Side by Side Diff: chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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
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/chromeos/events/xinput_hierarchy_changed_event_listener .h" 5 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h"
6 6
7 #include <X11/extensions/XInput2.h> 7 #include <X11/extensions/XInput2.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "ui/base/ime/chromeos/ime_keyboard.h" 10 #include "ui/base/ime/chromeos/ime_keyboard.h"
(...skipping 26 matching lines...) Expand all
37 keyboard->ReapplyCurrentModifierLockStatus(); 37 keyboard->ReapplyCurrentModifierLockStatus();
38 keyboard->ReapplyCurrentKeyboardLayout(); 38 keyboard->ReapplyCurrentKeyboardLayout();
39 } 39 }
40 } 40 }
41 41
42 } // namespace 42 } // namespace
43 43
44 // static 44 // static
45 XInputHierarchyChangedEventListener* 45 XInputHierarchyChangedEventListener*
46 XInputHierarchyChangedEventListener::GetInstance() { 46 XInputHierarchyChangedEventListener::GetInstance() {
47 return Singleton<XInputHierarchyChangedEventListener>::get(); 47 return base::Singleton<XInputHierarchyChangedEventListener>::get();
48 } 48 }
49 49
50 XInputHierarchyChangedEventListener::XInputHierarchyChangedEventListener() 50 XInputHierarchyChangedEventListener::XInputHierarchyChangedEventListener()
51 : stopped_(false) { 51 : stopped_(false) {
52 ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this); 52 ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
53 } 53 }
54 54
55 XInputHierarchyChangedEventListener::~XInputHierarchyChangedEventListener() { 55 XInputHierarchyChangedEventListener::~XInputHierarchyChangedEventListener() {
56 Stop(); 56 Stop();
57 } 57 }
(...skipping 21 matching lines...) Expand all
79 79
80 XGenericEventCookie* cookie = &(xevent->xcookie); 80 XGenericEventCookie* cookie = &(xevent->xcookie);
81 81
82 if (cookie->evtype == XI_HierarchyChanged) { 82 if (cookie->evtype == XI_HierarchyChanged) {
83 XIHierarchyEvent* event = static_cast<XIHierarchyEvent*>(cookie->data); 83 XIHierarchyEvent* event = static_cast<XIHierarchyEvent*>(cookie->data);
84 HandleHierarchyChangedEvent(event); 84 HandleHierarchyChangedEvent(event);
85 } 85 }
86 } 86 }
87 87
88 } // namespace chromeos 88 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698