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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/webui_screen_locker.cc

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: With this patchset, Chrome runs and exits normally on Linux. 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
« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/chromeos/login/signed_settings_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | content/public/browser/browser_main_parts.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/webui_screen_locker.cc
diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc
index afd1665f60cec0b3e508a0db05243af9965db79b..4d1b5feeee929ac8c56f2f7d21ac9ac7b2efe8f4 100644
--- a/chrome/browser/chromeos/login/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/webui_screen_locker.cc
@@ -4,15 +4,6 @@
#include "chrome/browser/chromeos/login/webui_screen_locker.h"
-#include <X11/extensions/XTest.h>
-#include <X11/keysym.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-
-// Evil hack to undo X11 evil #define.
-#undef None
-#undef Status
-
#include "base/command_line.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
@@ -33,6 +24,12 @@
#include "ui/gfx/screen.h"
#include "views/widget/native_widget_gtk.h"
+// These conflict with some of the Chrome headers, so must be included last.
+#include <X11/extensions/XTest.h>
+#include <X11/keysym.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+
namespace {
// URL which corresponds to the login WebUI.
« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/chromeos/login/signed_settings_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | content/public/browser/browser_main_parts.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698