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

Unified Diff: ui/gfx/x/x11_switches.h

Issue 297983005: linux_aura: Bail early if we can't connect to the X11 server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to TOT and resolve conflicts. 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 | « ui/gfx/x/gfx_x11.gyp ('k') | ui/gfx/x/x11_switches.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/x/x11_switches.h
diff --git a/ui/display/display_switches.cc b/ui/gfx/x/x11_switches.h
similarity index 51%
copy from ui/display/display_switches.cc
copy to ui/gfx/x/x11_switches.h
index 7d32b5b6b99afa47980be4901f59c6de243d792f..4044c514154fff25385159f00dddbcb0d2b67c2b 100644
--- a/ui/display/display_switches.cc
+++ b/ui/gfx/x/x11_switches.h
@@ -2,15 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/display/display_switches.h"
+#ifndef UI_GFX_X_X11_SWITCHES_H_
+#define UI_GFX_X_X11_SWITCHES_H_
+
+#include "ui/gfx/gfx_export.h"
-namespace ui {
namespace switches {
-#if defined(OS_CHROMEOS)
-const char kDisableDisplayColorCalibration[] =
- "disable-display-color-calibration";
+#if !defined(OS_CHROMEOS)
+GFX_EXPORT extern const char kX11Display[];
#endif
} // namespace switches
-} // namespace ui
+
+#endif // UI_GFX_X_X11_SWITCHES_H_
« no previous file with comments | « ui/gfx/x/gfx_x11.gyp ('k') | ui/gfx/x/x11_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698