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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/display/display_controller.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months 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 | « trunk/src/ash/ash_constants.cc ('k') | trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/display/display_controller.cc
===================================================================
--- trunk/src/ash/display/display_controller.cc (revision 269901)
+++ trunk/src/ash/display/display_controller.cc (working copy)
@@ -43,8 +43,6 @@
#include "ash/display/display_configurator_animation.h"
#include "base/sys_info.h"
#include "base/time/time.h"
-#endif // defined(OS_CHROMEOS)
-
#if defined(USE_X11)
#include "ui/base/x/x11_util.h"
#include "ui/gfx/x/x11_types.h"
@@ -54,8 +52,8 @@
#include <X11/extensions/Xrandr.h>
#undef RootWindow
#endif // defined(USE_X11)
+#endif // defined(OS_CHROMEOS)
-
namespace ash {
namespace {
« no previous file with comments | « trunk/src/ash/ash_constants.cc ('k') | trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698