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

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix official build, avoid DCHECK in official Linux/ChromeOS builds. Created 9 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 | 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>
13 #include <X11/Xlib.h>
14 #include <glib.h>
15 #include <stdlib.h> 12 #include <stdlib.h>
16 #include <string.h> 13 #include <string.h>
17 14
18 #include "base/logging.h" 15 #include "base/logging.h"
19 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
20 #include "base/process_util.h" 17 #include "base/process_util.h"
21 #include "base/string_util.h" 18 #include "base/string_util.h"
22 #include "base/stringprintf.h" 19 #include "base/stringprintf.h"
23 #include "chrome/browser/chromeos/input_method/input_method_util.h" 20 #include "chrome/browser/chromeos/input_method/input_method_util.h"
24 #include "chrome/browser/chromeos/system/runtime_environment.h" 21 #include "chrome/browser/chromeos/system/runtime_environment.h"
25 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
26 #include "ui/base/x/x11_util.h" 23 #include "ui/base/x/x11_util.h"
27 24
25 // These includes conflict with base/tracked_objects.h so must come last.
26 #include <X11/XKBlib.h>
27 #include <X11/Xlib.h>
28 #include <glib.h>
29
28 using content::BrowserThread; 30 using content::BrowserThread;
29 31
30 namespace chromeos { 32 namespace chromeos {
31 namespace input_method { 33 namespace input_method {
32 namespace { 34 namespace {
33 35
34 // The default keyboard layout name in the xorg config file. 36 // The default keyboard layout name in the xorg config file.
35 const char kDefaultLayoutName[] = "us"; 37 const char kDefaultLayoutName[] = "us";
36 38
37 // The command we use to set the current XKB layout and modifier key mapping. 39 // The command we use to set the current XKB layout and modifier key mapping.
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 case kCapsLockKey: 533 case kCapsLockKey:
532 return "capslock"; 534 return "capslock";
533 case kNumModifierKeys: 535 case kNumModifierKeys:
534 break; 536 break;
535 } 537 }
536 return ""; 538 return "";
537 } 539 }
538 540
539 } // namespace input_method 541 } // namespace input_method
540 } // namespace chromeos 542 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698