| Index: chrome/browser/prefs/incognito_mode_prefs.cc
|
| ===================================================================
|
| --- chrome/browser/prefs/incognito_mode_prefs.cc (revision 256983)
|
| +++ chrome/browser/prefs/incognito_mode_prefs.cc (working copy)
|
| @@ -77,15 +77,17 @@
|
| switch (GetAvailability(profile->GetPrefs())) {
|
| case IncognitoModePrefs::ENABLED:
|
| return true;
|
| +
|
| case IncognitoModePrefs::DISABLED:
|
| return !profile->IsOffTheRecord();
|
| +
|
| case IncognitoModePrefs::FORCED:
|
| return profile->IsOffTheRecord();
|
| - case IncognitoModePrefs::AVAILABILITY_NUM_TYPES:
|
| +
|
| + default:
|
| NOTREACHED();
|
| + return false;
|
| }
|
| - NOTREACHED();
|
| - return false;
|
| }
|
|
|
| // static
|
| @@ -96,6 +98,7 @@
|
| return base::win::IsParentalControlActivityLoggingOn();
|
| #elif defined(OS_ANDROID)
|
| return chrome::android::ChromiumApplication::AreParentalControlsEnabled();
|
| +#else
|
| + return false;
|
| #endif
|
| - return false;
|
| }
|
|
|