Revamp the Incognito NTP on Desktop

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

 // Copyright 2012 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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 122 matching lines @@
 
 // How the background image on the new tab page should be tiled (see tiling
 // masks in theme_service.h).
 std::string GetNewTabBackgroundTilingCSS(
     const ui::ThemeProvider& theme_provider) {
   int repeat_mode =
       theme_provider.GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_TILING);
   return ThemeProperties::TilingToString(repeat_mode);
 }
 
+bool IsMDIncognitoTabEnabled() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableMaterialDesignIncognitoNTP);
+}
+
 }  // namespace
 
 NTPResourceCache::NTPResourceCache(Profile* profile)
     : profile_(profile), is_swipe_tracking_from_scroll_events_enabled_(false),
       should_show_apps_page_(NewTabUI::ShouldShowApps()),
       should_show_other_devices_menu_(true) {
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
 
@@ skipping 115 matching lines @@
   new_tab_incognito_html_ = nullptr;
   new_tab_html_ = nullptr;
   new_tab_incognito_css_ = nullptr;
   new_tab_css_ = nullptr;
 }
 
 void NTPResourceCache::CreateNewTabIncognitoHTML() {
   base::DictionaryValue localized_strings;
   localized_strings.SetString("title",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
-  int new_tab_description_ids = IDS_NEW_TAB_OTR_DESCRIPTION;
-  int new_tab_heading_ids = IDS_NEW_TAB_OTR_HEADING;
+
+  int new_tab_heading_ids;
+  int new_tab_description_ids;
+  int new_tab_warning_ids;
+  int new_tab_features_ids;
+  int new_tab_html_idr;

[Dan Beam, 2017/04/11 00:31:12]

all these uninitialized ints make me a little nervous

[msramek, 2017/04/11 19:04:27]

Done.

Me too, actually :) The current approach seemed cleaner than to assign one set
of values, and then conditionally reassign. But we can do it that way too.

+
+  if (IsMDIncognitoTabEnabled() && !profile_->IsGuestSession()) {
+    new_tab_description_ids = IDS_NEW_TAB_OTR_SUBTITLE;
+    new_tab_heading_ids = IDS_NEW_TAB_OTR_TITLE;
+    new_tab_warning_ids = IDS_NEW_TAB_OTR_VISIBLE;
+    new_tab_features_ids = IDS_NEW_TAB_OTR_NOT_SAVED;
+    new_tab_html_idr = IDR_MD_INCOGNITO_TAB_HTML;
+  } else {
+    new_tab_description_ids = IDS_NEW_TAB_OTR_DESCRIPTION;
+    new_tab_heading_ids = IDS_NEW_TAB_OTR_HEADING;
+    new_tab_warning_ids = IDS_NEW_TAB_OTR_MESSAGE_WARNING;
+    // new_tab_features_ids is not used in the old version.

[Dan Beam, 2017/04/11 00:31:12]

new_tab_feature_ids is not initialized explicitly, meaning it could be garbage

[msramek, 2017/04/11 19:04:27]

Indeed, but its only usage is guarded by IsMDIncognitoTabEnabled(). Let me
initialize it to 0.

+    new_tab_html_idr = IDR_INCOGNITO_TAB_HTML;
+  }
+
   int new_tab_link_ids = IDS_NEW_TAB_OTR_LEARN_MORE_LINK;
-  int new_tab_warning_ids = IDS_NEW_TAB_OTR_MESSAGE_WARNING;
-  int new_tab_html_idr = IDR_INCOGNITO_TAB_HTML;
   const char* new_tab_link = kLearnMoreIncognitoUrl;
 
   if (profile_->IsGuestSession()) {
     localized_strings.SetString("guestTabDescription",
         l10n_util::GetStringUTF16(new_tab_description_ids));
     localized_strings.SetString("guestTabHeading",
         l10n_util::GetStringUTF16(new_tab_heading_ids));
   } else {
     localized_strings.SetString("incognitoTabDescription",
         l10n_util::GetStringUTF16(new_tab_description_ids));
     localized_strings.SetString("incognitoTabHeading",
         l10n_util::GetStringUTF16(new_tab_heading_ids));
+    if (IsMDIncognitoTabEnabled()) {
+      localized_strings.SetString(
+          "incognitoTabFeatures",
+          l10n_util::GetStringUTF16(new_tab_features_ids));
+    }
     localized_strings.SetString("incognitoTabWarning",
         l10n_util::GetStringUTF16(new_tab_warning_ids));
   }
 
   localized_strings.SetString("learnMore",
       l10n_util::GetStringUTF16(new_tab_link_ids));
   localized_strings.SetString("learnMoreLink", new_tab_link);
 
   bool bookmark_bar_attached =
       profile_->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar);
@@ skipping 279 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string =
       ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }