| commit | fb0943e0e0224b8702e4dc1a0f372356e7092dc0 | [log] [tgz] |
|---|---|---|
| author | Xiaohui Chen <[email protected]> | Tue Oct 16 22:44:37 2018 |
| committer | Commit Bot <[email protected]> | Tue Oct 16 22:44:37 2018 |
| tree | 9aa2f3f729e52e797c919f21bac35a55dda9dcfa | |
| parent | 3fc2105ef4ed16f850f9f20c9939ecba6a21a77b [diff] [blame] |
assistant: Add flags Bug: b/117793448 Test: histogram unit tests and manual test on device Change-Id: I3233920570752391a295da90de1f9b48d1f02924 Reviewed-on: https://chromium-review.googlesource.com/c/1285049 Reviewed-by: Tao Wu <[email protected]> Commit-Queue: Xiaohui Chen <[email protected]> Cr-Commit-Position: refs/heads/master@{#600157}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index cbb8dac..12cda67 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -4466,6 +4466,12 @@ kOsAndroid, FEATURE_VALUE_TYPE(safe_browsing::kUseLocalBlacklistsV2)}, #endif // defined(OS_ANDROID) +#if defined(OS_CHROMEOS) + {"enable-native-google-assistant", + flag_descriptions::kEnableGoogleAssistantName, + flag_descriptions::kEnableGoogleAssistantDescription, kOsCrOS, + FEATURE_VALUE_TYPE(chromeos::switches::kAssistantFeature)}, +#endif // defined(OS_ANDROID) }; class FlagsStateSingleton {