Chromium Code Reviews| Index: chrome/common/extensions/docs/server2/availability_finder.py |
| diff --git a/chrome/common/extensions/docs/server2/availability_finder.py b/chrome/common/extensions/docs/server2/availability_finder.py |
| index 4105703e3fd886d70feb828d4b9a259adedd6506..5f4139225a03a7f9c006d6f13e60ae2c73196793 100644 |
| --- a/chrome/common/extensions/docs/server2/availability_finder.py |
| +++ b/chrome/common/extensions/docs/server2/availability_finder.py |
| @@ -161,14 +161,17 @@ class AvailabilityFinder(object): |
| # are present in Chrome 20 and onwards. Fall back to a check for file |
| # system existence if the API is not stable in any of the _features.json |
| # files. |
| - available = _GetChannelFromApiFeatures(api_name, features_fs) == _STABLE |
| + available = _GetChannelFromApiFeatures(api_name, features_fs) |
| if version >= 20: |
| # Check other _features.json files/file existence if the API wasn't |
| # found in _api_features.json, or if _api_features.json wasn't present. |
| available = available or ( |
| - _GetChannelFromPermissionFeatures(api_name, features_fs) == _STABLE |
| - or _GetChannelFromManifestFeatures(api_name, features_fs) == _STABLE |
| - or _ExistsInFileSystem(api_name, names_fs)) |
| + _GetChannelFromPermissionFeatures(api_name, features_fs) |
| + or _GetChannelFromManifestFeatures(api_name, features_fs)) |
| + if available is None: |
| + available = _ExistsInFileSystem(api_name, names_fs) |
| + else: |
| + available = available == _STABLE |
|
epeterson
2013/07/03 19:05:02
There was a bug here: file system existence was ch
not at google - send to devlin
2013/07/03 19:54:56
Cool, nice catch.
But I don't like the way that a
epeterson
2013/07/09 20:51:18
Done. Also updated 'channel' to 'available_channel
|
| elif version >= 18: |
| # These versions are a little troublesome. Version 19 has |
| # _permission_features.json, but it lacks 'channel' information. |