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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/input_method/xkeyboard.cc

Issue 8718012: Revert 111695 - Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/xkeyboard.cc
===================================================================
--- chrome/browser/chromeos/input_method/xkeyboard.cc (revision 111697)
+++ chrome/browser/chromeos/input_method/xkeyboard.cc (working copy)
@@ -9,6 +9,9 @@
#include <string>
#include <utility>
+#include <X11/XKBlib.h>
+#include <X11/Xlib.h>
+#include <glib.h>
#include <stdlib.h>
#include <string.h>
@@ -22,11 +25,6 @@
#include "content/public/browser/browser_thread.h"
#include "ui/base/x/x11_util.h"
-// These includes conflict with base/tracked_objects.h so must come last.
-#include <X11/XKBlib.h>
-#include <X11/Xlib.h>
-#include <glib.h>
-
using content::BrowserThread;
namespace chromeos {
« 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