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

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/x/gfx_x11.gyp ('k') | ui/gfx/x/x11_switches.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/display/display_switches.h" 5 #ifndef UI_GFX_X_X11_SWITCHES_H_
6 #define UI_GFX_X_X11_SWITCHES_H_
6 7
7 namespace ui { 8 #include "ui/gfx/gfx_export.h"
9
8 namespace switches { 10 namespace switches {
9 11
10 #if defined(OS_CHROMEOS) 12 #if !defined(OS_CHROMEOS)
11 const char kDisableDisplayColorCalibration[] = 13 GFX_EXPORT extern const char kX11Display[];
12 "disable-display-color-calibration";
13 #endif 14 #endif
14 15
15 } // namespace switches 16 } // namespace switches
16 } // namespace ui 17
18 #endif // UI_GFX_X_X11_SWITCHES_H_
OLDNEW
« 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