--- chrome/browser/tab_contents/constrained_window.h
+++ chrome/browser/tab_contents/constrained_window.h
@@ -14,7 +14,7 @@ namespace views {
 class WindowDelegate;
 }
 typedef views::WindowDelegate ConstrainedWindowDelegate;
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
 class ConstrainedWindowGtkDelegate;
 typedef ConstrainedWindowGtkDelegate ConstrainedWindowDelegate;
 #elif defined(OS_MACOSX)
diff --git chrome/browser/tab_contents/interstitial_page.cc chrome/browser/tab_contents/interstitial_page.cc
index 34e008c..1bae8d4 100644