OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/prefs/incognito_mode_prefs.h" | 5 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 FROM_HERE, | 201 FROM_HERE, |
202 base::Bind( | 202 base::Bind( |
203 base::IgnoreResult(&PlatformParentalControlsValue::GetInstance))); | 203 base::IgnoreResult(&PlatformParentalControlsValue::GetInstance))); |
204 } | 204 } |
205 #endif | 205 #endif |
206 | 206 |
207 // static | 207 // static |
208 bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() { | 208 bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() { |
209 #if defined(OS_WIN) | 209 #if defined(OS_WIN) |
210 return PlatformParentalControlsValue::GetInstance()->is_enabled(); | 210 return PlatformParentalControlsValue::GetInstance()->is_enabled(); |
211 #elif defined(OS_ANDROID) | 211 // TODO(mfomitchev): ifdefing for now |
| 212 #elif defined(OS_ANDROID) && !defined(USE_AURA) |
212 return chrome::android::ChromeApplication::AreParentalControlsEnabled(); | 213 return chrome::android::ChromeApplication::AreParentalControlsEnabled(); |
213 #else | 214 #else |
214 return false; | 215 return false; |
215 #endif | 216 #endif |
216 } | 217 } |
217 | 218 |
OLD | NEW |