Show the Data Saver string for offline previews when Data Saver is enabled

chrome/browser/previews/previews_infobar_delegate.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/previews/previews_infobar_delegate.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
@@ skipping 37 matching lines @@
 
 PreviewsInfoBarDelegate::~PreviewsInfoBarDelegate() {
   if (!on_dismiss_callback_.is_null())
     on_dismiss_callback_.Run(false);
 }
 
 // static
 void PreviewsInfoBarDelegate::Create(
     content::WebContents* web_contents,
     PreviewsInfoBarType infobar_type,
+    bool is_data_saver_user,
     const OnDismissPreviewsInfobarCallback& on_dismiss_callback) {
   PreviewsInfoBarTabHelper* infobar_tab_helper =
       PreviewsInfoBarTabHelper::FromWebContents(web_contents);
   if (infobar_tab_helper->displayed_preview_infobar())
     return;
 
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
 
   infobars::InfoBar* infobar =
       infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
           std::unique_ptr<ConfirmInfoBarDelegate>(new PreviewsInfoBarDelegate(
-              web_contents, infobar_type, on_dismiss_callback))));
+              web_contents, infobar_type, is_data_saver_user,
+              on_dismiss_callback))));
 
   if (infobar && (infobar_type == LITE_PAGE || infobar_type == LOFI)) {
     auto* data_reduction_proxy_settings =
         DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
             web_contents->GetBrowserContext());
     data_reduction_proxy_settings->IncrementLoFiUIShown();
   }
 
   RecordPreviewsInfoBarAction(infobar_type, INFOBAR_SHOWN);
   infobar_tab_helper->set_displayed_preview_infobar(true);
 }
 
 PreviewsInfoBarDelegate::PreviewsInfoBarDelegate(
     content::WebContents* web_contents,
     PreviewsInfoBarType infobar_type,
+    bool is_data_saver_user,
     const OnDismissPreviewsInfobarCallback& on_dismiss_callback)
     : ConfirmInfoBarDelegate(),
       infobar_type_(infobar_type),
+      is_data_saver_user_(is_data_saver_user),
       on_dismiss_callback_(on_dismiss_callback) {}
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 PreviewsInfoBarDelegate::GetIdentifier() const {
   return DATA_REDUCTION_PROXY_PREVIEW_INFOBAR_DELEGATE;
 }
 
 int PreviewsInfoBarDelegate::GetIconId() const {
 #if defined(OS_ANDROID)
   return IDR_ANDROID_INFOBAR_PREVIEWS;
 #else
   return kNoIconID;
 #endif
 }
 
 bool PreviewsInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   RecordPreviewsInfoBarAction(infobar_type_, INFOBAR_DISMISSED_BY_NAVIGATION);
   return InfoBarDelegate::ShouldExpire(details);
 }
 
 void PreviewsInfoBarDelegate::InfoBarDismissed() {
   RecordPreviewsInfoBarAction(infobar_type_, INFOBAR_DISMISSED_BY_USER);
 }
 
 base::string16 PreviewsInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringUTF16((infobar_type_ == OFFLINE)
-                                       ? IDS_PREVIEWS_INFOBAR_FASTER_PAGE_TITLE
-                                       : IDS_PREVIEWS_INFOBAR_SAVED_DATA_TITLE);
+  return l10n_util::GetStringUTF16(
+      (is_data_saver_user_) ? IDS_PREVIEWS_INFOBAR_SAVED_DATA_TITLE

[bengr, 2016/12/16 00:38:43]

Seems you want to choose a string when you create an infobar, so why not store
the string id instead of is_data_saver_user_? That would be less confusing,
because afaik the user could disable data saver while the infobar is being
shown.

[RyanSturm, 2016/12/16 19:02:09]

Done.

+                            : IDS_PREVIEWS_INFOBAR_FASTER_PAGE_TITLE);
 }
 
 int PreviewsInfoBarDelegate::GetButtons() const {
   return BUTTON_NONE;
 }
 
 base::string16 PreviewsInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_LINK);
 }
 
@@ skipping 14 matching lines @@
     auto* data_reduction_proxy_settings =
         DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
             web_contents->GetBrowserContext());
     data_reduction_proxy_settings->IncrementLoFiUserRequestsForImages();
   } else if (infobar_type_ == OFFLINE) {
     web_contents->GetController().Reload(true);
   }
 
   return true;
 }