Chromium Code Reviews| Index: extensions/browser/api/system_display/system_display_api.h |
| diff --git a/extensions/browser/api/system_display/system_display_api.h b/extensions/browser/api/system_display/system_display_api.h |
| index 349c8406482eb13d44faf3a55f470cba7b7f6ccb..1462175c705e2becfdeb2929858d31929aee7ec4 100644 |
| --- a/extensions/browser/api/system_display/system_display_api.h |
| +++ b/extensions/browser/api/system_display/system_display_api.h |
| @@ -11,14 +11,18 @@ |
| namespace extensions { |
| -class SystemDisplayFunction : public SyncExtensionFunction { |
| +class SystemDisplayFunction : public UIThreadExtensionFunction { |
| public: |
| static const char kCrosOnlyError[]; |
| static const char kKioskOnlyError[]; |
| protected: |
| ~SystemDisplayFunction() override {} |
| - bool CheckValidExtension(); |
| + bool PreRunValidation(std::string* error) override; |
| + |
| + // Returns true if this function should be restricted to kiosk-mode apps and |
| + // webui. The default is true. |
| + virtual bool ShouldRestrictToKioskAndWebUI(); |
|
lazyboy
2016/08/26 23:13:16
Not obvious to me where webui comes to play, can y
Devlin
2016/08/29 16:05:57
I've changed the implementation to be clearer. Us
|
| }; |
| class SystemDisplayGetInfoFunction : public SystemDisplayFunction { |
| @@ -27,7 +31,8 @@ class SystemDisplayGetInfoFunction : public SystemDisplayFunction { |
| protected: |
| ~SystemDisplayGetInfoFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| + bool ShouldRestrictToKioskAndWebUI() override; |
| }; |
| class SystemDisplayGetDisplayLayoutFunction : public SystemDisplayFunction { |
| @@ -37,7 +42,8 @@ class SystemDisplayGetDisplayLayoutFunction : public SystemDisplayFunction { |
| protected: |
| ~SystemDisplayGetDisplayLayoutFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| + bool ShouldRestrictToKioskAndWebUI() override; |
| }; |
| class SystemDisplaySetDisplayPropertiesFunction : public SystemDisplayFunction { |
| @@ -47,7 +53,7 @@ class SystemDisplaySetDisplayPropertiesFunction : public SystemDisplayFunction { |
| protected: |
| ~SystemDisplaySetDisplayPropertiesFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| class SystemDisplaySetDisplayLayoutFunction : public SystemDisplayFunction { |
| @@ -57,7 +63,7 @@ class SystemDisplaySetDisplayLayoutFunction : public SystemDisplayFunction { |
| protected: |
| ~SystemDisplaySetDisplayLayoutFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| class SystemDisplayEnableUnifiedDesktopFunction : public SystemDisplayFunction { |
| @@ -67,7 +73,7 @@ class SystemDisplayEnableUnifiedDesktopFunction : public SystemDisplayFunction { |
| protected: |
| ~SystemDisplayEnableUnifiedDesktopFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| class SystemDisplayOverscanCalibrationStartFunction |
| @@ -78,7 +84,7 @@ class SystemDisplayOverscanCalibrationStartFunction |
| protected: |
| ~SystemDisplayOverscanCalibrationStartFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| class SystemDisplayOverscanCalibrationAdjustFunction |
| @@ -89,7 +95,7 @@ class SystemDisplayOverscanCalibrationAdjustFunction |
| protected: |
| ~SystemDisplayOverscanCalibrationAdjustFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| class SystemDisplayOverscanCalibrationResetFunction |
| @@ -100,7 +106,7 @@ class SystemDisplayOverscanCalibrationResetFunction |
| protected: |
| ~SystemDisplayOverscanCalibrationResetFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| class SystemDisplayOverscanCalibrationCompleteFunction |
| @@ -111,7 +117,7 @@ class SystemDisplayOverscanCalibrationCompleteFunction |
| protected: |
| ~SystemDisplayOverscanCalibrationCompleteFunction() override {} |
| - bool RunSync() override; |
| + ResponseAction Run() override; |
| }; |
| } // namespace extensions |