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

Side by Side Diff: ui/accessibility/platform/atk_util_auralinux.cc

Issue 1989233002: only use kAccessibilityEnabled inside USE_GCONF ifdef blocks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <atk/atk.h> 5 #include <atk/atk.h>
6 #if defined(USE_GCONF) 6 #if defined(USE_GCONF)
7 #include <gconf/gconf-client.h> 7 #include <gconf/gconf-client.h>
8 #endif 8 #endif
9 #include <glib-2.0/gmodule.h> 9 #include <glib-2.0/gmodule.h>
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #else // !defined(USE_GCONF) 78 #else // !defined(USE_GCONF)
79 79
80 bool PlatformShouldEnableAccessibility() { 80 bool PlatformShouldEnableAccessibility() {
81 // TODO(iceman): implement this for non-GNOME desktops. 81 // TODO(iceman): implement this for non-GNOME desktops.
82 return false; 82 return false;
83 } 83 }
84 84
85 #endif // defined(USE_GCONF) 85 #endif // defined(USE_GCONF)
86 86
87 bool ShouldEnableAccessibility() { 87 bool ShouldEnableAccessibility() {
88 #if defined(USE_GCONF)
88 char* enable_accessibility = getenv(kAccessibilityEnabled); 89 char* enable_accessibility = getenv(kAccessibilityEnabled);
89 if ((enable_accessibility && atoi(enable_accessibility) == 1) || 90 if ((enable_accessibility && atoi(enable_accessibility) == 1) ||
90 PlatformShouldEnableAccessibility()) 91 PlatformShouldEnableAccessibility())
91 return true; 92 return true;
93 #endif // defined(USE_GCONF)
92 94
93 return false; 95 return false;
94 } 96 }
95 97
96 } // namespace 98 } // namespace
97 99
98 G_BEGIN_DECLS 100 G_BEGIN_DECLS
99 101
100 // 102 //
101 // atk_util_auralinux AtkObject definition and implementation. 103 // atk_util_auralinux AtkObject definition and implementation.
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 237
236 void AtkUtilAuraLinux::CheckIfAccessibilityIsEnabledOnFileThread() { 238 void AtkUtilAuraLinux::CheckIfAccessibilityIsEnabledOnFileThread() {
237 } 239 }
238 240
239 void AtkUtilAuraLinux::FinishAccessibilityInitOnUIThread() { 241 void AtkUtilAuraLinux::FinishAccessibilityInitOnUIThread() {
240 } 242 }
241 243
242 #endif // defined(USE_GCONF) 244 #endif // defined(USE_GCONF)
243 245
244 } // namespace ui 246 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698