Add timestamp support to the Previews infobar

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 "base/optional.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"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/previews/previews_infobar_tab_helper.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/ui/android/infobars/previews_infobar.h"
+#endif
+
 namespace {
 
 // Key of the UMA Previews.InfoBarAction.LoFi histogram.
 const char kUMAPreviewsInfoBarActionLoFi[] = "Previews.InfoBarAction.LoFi";
 
 // Key of the UMA Previews.InfoBarAction.Offline histogram.
 const char kUMAPreviewsInfoBarActionOffline[] =
     "Previews.InfoBarAction.Offline";
 
 // Key of the UMA Previews.InfoBarAction.LitePage histogram.
@@ skipping 17 matching lines @@
 
 }  // namespace
 
 PreviewsInfoBarDelegate::~PreviewsInfoBarDelegate() {
   if (!on_dismiss_callback_.is_null())
     on_dismiss_callback_.Run(false);
 
   RecordPreviewsInfoBarAction(infobar_type_, infobar_dismissed_action_);
 }
 
+PreviewsInfoBarDelegate* PreviewsInfoBarDelegate::AsPreviewsInfoBarDelegate() {
+  return this;
+}
+
 // 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);
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
 
   // The WebContents may not have TabHelpers set. If TabHelpers are not set,
   // don't show Previews infobars.
   if (!infobar_tab_helper || !infobar_service)
     return;
   if (infobar_tab_helper->displayed_preview_infobar())
     return;
 
+#if defined(OS_ANDROID)
+  infobars::InfoBar* infobar =
+      infobar_service->AddInfoBar(PreviewsInfoBar::CreateInfoBar(
+          infobar_service,
+          std::unique_ptr<PreviewsInfoBarDelegate>(new PreviewsInfoBarDelegate(

[Peter Kasting, 2017/05/08 23:33:35]

Nit: Since PreviewsInfoBarDelegate is a ConfirmInfoBarDelegate, it seems like
you should be able to factor the creation of that inner object into a common
block above the #if, and only have the rest (or maybe even only the
CreateInfoBar() portion of the statement) ifdefed.

[megjablon, 2017/05/09 00:14:30]

Done.

+              web_contents, infobar_type, is_data_saver_user,
+              on_dismiss_callback))));
+#else
   infobars::InfoBar* infobar =
       infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
           std::unique_ptr<ConfirmInfoBarDelegate>(new PreviewsInfoBarDelegate(
               web_contents, infobar_type, is_data_saver_user,
               on_dismiss_callback))));
+#endif
 
   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);
@@ skipping 80 matching lines @@
   } else if (infobar_type_ == OFFLINE) {
     // Prevent LoFi and lite page modes from showing after reload.
     // TODO(ryansturm): rename DISABLE_LOFI_MODE to DISABLE_PREVIEWS.
     //  crbug.com/707272
     web_contents->GetController().Reload(content::ReloadType::DISABLE_LOFI_MODE,
                                          true);
   }
 
   return true;
 }
+
+base::string16 PreviewsInfoBarDelegate::GetTimestampText() const {
+  return base::string16();
+}