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

Side by Side Diff: chrome/browser/chromeos/input_method/xkeyboard.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. 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/input_method/xkeyboard.h" 5 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include <X11/XKBlib.h> 12 #include <X11/XKBlib.h>
13 #include <X11/Xlib.h> 13 #include <X11/Xlib.h>
14 #include <glib.h> 14 #include <glib.h>
15 #include <stdlib.h> 15 #include <stdlib.h>
16 #include <string.h> 16 #include <string.h>
17 17
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "base/process_util.h" 20 #include "base/process_util.h"
21 #include "base/string_util.h" 21 #include "base/string_util.h"
22 #include "base/stringprintf.h" 22 #include "base/stringprintf.h"
23 #include "chrome/browser/chromeos/input_method/input_method_util.h" 23 #include "chrome/browser/chromeos/input_method/input_method_util.h"
24 #include "chrome/browser/chromeos/system/runtime_environment.h" 24 #include "chrome/browser/chromeos/system/runtime_environment.h"
25 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
26 #include "ui/base/x/x11_util.h" 26 #include "ui/base/x/x11_util.h"
27 27
28 using content::BrowserThread;
29
28 namespace chromeos { 30 namespace chromeos {
29 namespace input_method { 31 namespace input_method {
30 namespace { 32 namespace {
31 33
32 // The default keyboard layout name in the xorg config file. 34 // The default keyboard layout name in the xorg config file.
33 const char kDefaultLayoutName[] = "us"; 35 const char kDefaultLayoutName[] = "us";
34 36
35 // The command we use to set the current XKB layout and modifier key mapping. 37 // The command we use to set the current XKB layout and modifier key mapping.
36 // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105) 38 // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
37 const char kSetxkbmapCommand[] = "/usr/bin/setxkbmap"; 39 const char kSetxkbmapCommand[] = "/usr/bin/setxkbmap";
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 case kCapsLockKey: 395 case kCapsLockKey:
394 return "capslock"; 396 return "capslock";
395 case kNumModifierKeys: 397 case kNumModifierKeys:
396 break; 398 break;
397 } 399 }
398 return ""; 400 return "";
399 } 401 }
400 402
401 } // namespace input_method 403 } // namespace input_method
402 } // namespace chromeos 404 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698