Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 syntax = "proto2"; | 5 syntax = "proto2"; |
| 6 | 6 |
| 7 option optimize_for = LITE_RUNTIME; | 7 option optimize_for = LITE_RUNTIME; |
| 8 | 8 |
| 9 package enterprise_management; | 9 package enterprise_management; |
| 10 | 10 |
| (...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 776 // The url and hash that specified in JSON format that can be used to set the | 776 // The url and hash that specified in JSON format that can be used to set the |
| 777 // device-level wallpaper on the login screen before any user logs in. | 777 // device-level wallpaper on the login screen before any user logs in. |
| 778 message DeviceWallpaperImageProto { | 778 message DeviceWallpaperImageProto { |
| 779 optional string device_wallpaper_image = 1; | 779 optional string device_wallpaper_image = 1; |
| 780 } | 780 } |
| 781 | 781 |
| 782 // Migration strategy for the case when ARC(N+) needs the ext4 encryption while | 782 // Migration strategy for the case when ARC(N+) needs the ext4 encryption while |
| 783 // the device used ecryptfs in the past. | 783 // the device used ecryptfs in the past. |
| 784 message DeviceEcryptfsMigrationStrategyProto { | 784 message DeviceEcryptfsMigrationStrategyProto { |
| 785 enum MigrationStrategy { | 785 enum MigrationStrategy { |
| 786 // Default value, unspecified. | |
| 787 MIGRATION_STRATEGY_UNSPECIFIED = 0; | |
|
Andrew T Wilson (Slow)
2017/05/22 12:30:56
I'm not sure that's what we want. What behavior do
bartfab (slow)
2017/05/22 13:23:47
We (the client) do not want or need an UNSET value
igorcov
2017/05/22 17:20:32
Changed to UNSET. Thanks for explanations.
Thiemo Nagel
2017/05/23 09:27:31
Imho this is just enforcing proto best practices (
| |
| 786 // ARC is not allowed, no data migration needed. | 788 // ARC is not allowed, no data migration needed. |
| 787 DISALLOW_ARC = 0; | 789 DISALLOW_ARC = 1; |
| 788 // The data migration is allowed, opening the possibility to use ARC. | 790 // The data migration is allowed, opening the possibility to use ARC. |
| 789 ALLOW_MIGRATION = 1; | 791 ALLOW_MIGRATION = 2; |
| 790 }; | 792 }; |
| 791 | 793 |
| 792 optional MigrationStrategy migration_strategy = 1; | 794 optional MigrationStrategy migration_strategy = 1; |
| 793 } | 795 } |
| 794 | 796 |
| 795 message ChromeDeviceSettingsProto { | 797 message ChromeDeviceSettingsProto { |
| 796 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; | 798 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; |
| 797 optional UserWhitelistProto user_whitelist = 2; | 799 optional UserWhitelistProto user_whitelist = 2; |
| 798 optional GuestModeEnabledProto guest_mode_enabled = 3; | 800 optional GuestModeEnabledProto guest_mode_enabled = 3; |
| 799 optional OBSOLETE_DeviceProxySettingsProto device_proxy_settings = 4 | 801 optional OBSOLETE_DeviceProxySettingsProto device_proxy_settings = 4 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 846 45; | 848 45; |
| 847 optional DeviceLoginScreenAppInstallListProto | 849 optional DeviceLoginScreenAppInstallListProto |
| 848 device_login_screen_app_install_list = 46; | 850 device_login_screen_app_install_list = 46; |
| 849 optional NetworkThrottlingEnabledProto network_throttling = 47; | 851 optional NetworkThrottlingEnabledProto network_throttling = 47; |
| 850 optional DeviceWallpaperImageProto device_wallpaper_image = 48; | 852 optional DeviceWallpaperImageProto device_wallpaper_image = 48; |
| 851 optional LoginScreenLocalesProto login_screen_locales = 49; | 853 optional LoginScreenLocalesProto login_screen_locales = 49; |
| 852 optional LoginScreenInputMethodsProto login_screen_input_methods = 50; | 854 optional LoginScreenInputMethodsProto login_screen_input_methods = 50; |
| 853 optional DeviceEcryptfsMigrationStrategyProto | 855 optional DeviceEcryptfsMigrationStrategyProto |
| 854 device_ecryptfs_migration_strategy = 51; | 856 device_ecryptfs_migration_strategy = 51; |
| 855 } | 857 } |
| OLD | NEW |