Chromium Code Reviews| Index: chrome/browser/previews/previews_service.cc |
| diff --git a/chrome/browser/previews/previews_service.cc b/chrome/browser/previews/previews_service.cc |
| index 8ddcfd18ca285b87f1c1733f6bb92f6b5b9896d2..cfe0969fd6b0a78b96e47860f8a6cdc2bf03c6b8 100644 |
| --- a/chrome/browser/previews/previews_service.cc |
| +++ b/chrome/browser/previews/previews_service.cc |
| @@ -10,6 +10,7 @@ |
| #include "base/sequenced_task_runner.h" |
| #include "base/threading/sequenced_worker_pool.h" |
| #include "chrome/common/chrome_constants.h" |
| +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" |
| #include "components/previews/core/previews_experiments.h" |
| #include "components/previews/core/previews_io_data.h" |
| #include "components/previews/core/previews_opt_out_store.h" |
| @@ -24,12 +25,19 @@ bool IsPreviewsTypeEnabled(previews::PreviewsType type) { |
| switch (type) { |
| case previews::PreviewsType::OFFLINE: |
| return previews::params::IsOfflinePreviewsEnabled(); |
| - case previews::PreviewsType::CLIENT_LOFI: |
| - return previews::params::IsClientLoFiEnabled(); |
| + case previews::PreviewsType::LOFI: |
| + return previews::params::IsClientLoFiEnabled() || |
| + data_reduction_proxy::params::IsLoFiOnViaFlags() || |
| + data_reduction_proxy::params::IsIncludedInLoFiEnabledFieldTrial(); |
| + case previews::PreviewsType::LITE_PAGE: |
| + return (data_reduction_proxy::params::IsLoFiOnViaFlags() && |
| + data_reduction_proxy::params::AreLitePagesEnabledViaFlags()) || |
| + data_reduction_proxy::params::IsIncludedInLitePageFieldTrial(); |
| case previews::PreviewsType::NONE: |
| case previews::PreviewsType::LAST: |
| break; |
| } |
| + LOG(WARNING) << static_cast<int>(type); |
|
tbansal1
2017/05/05 20:34:39
rm this
RyanSturm
2017/05/05 20:51:34
Done.
|
| NOTREACHED(); |
| return false; |
| } |
| @@ -40,8 +48,10 @@ int GetPreviewsTypeVersion(previews::PreviewsType type) { |
| switch (type) { |
| case previews::PreviewsType::OFFLINE: |
| return previews::params::OfflinePreviewsVersion(); |
| - case previews::PreviewsType::CLIENT_LOFI: |
| - return previews::params::ClientLoFiVersion(); |
| + case previews::PreviewsType::LOFI: |
| + return previews::params::LoFiVersion(); |
| + case previews::PreviewsType::LITE_PAGE: |
| + return data_reduction_proxy::params::LitePageVersion(); |
| case previews::PreviewsType::NONE: |
| case previews::PreviewsType::LAST: |
| break; |