Network error interstitial update - add suggestions list

components/error_page/renderer/net_error_helper_core.cc

 // Copyright 2013 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 "components/error_page/renderer/net_error_helper_core.h"
 
 #include <stddef.h>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 28 matching lines @@
 #include "url/url_constants.h"
 
 namespace error_page {
 
 namespace {
 
 // |NetErrorNavigationCorrectionTypes| enum id for Web search query.
 // Other correction types uses the |kCorrectionResourceTable| array order.
 const int kWebSearchQueryUMAId = 100;
 
+// Number of URL correction suggestions to display.
+const int kUrlCorrectionsToDisplay = 1;

[mmenke, 2016/02/18 19:51:19]

+kMaxUrl...?

[edwardjung, 2016/02/19 18:18:22]

Done.

+
 struct CorrectionTypeToResourceTable {
   int resource_id;
   const char* correction_type;
 };
 
 // Note: Ordering should be the same as |NetErrorNavigationCorrectionTypes| enum
 // in histograms.xml.
 const CorrectionTypeToResourceTable kCorrectionResourceTable[] = {
   {IDS_ERRORPAGES_SUGGESTION_VISIT_GOOGLE_CACHE, "cachedPage"},
   // "reloadPage" is has special handling.
@@ skipping 270 matching lines @@
     }
 
     // Allow reload page and web search query to be empty strings, but not
     // links.
     if ((*it)->url_correction.empty())
       continue;
     size_t correction_index;
     for (correction_index = 0;
          correction_index < arraysize(kCorrectionResourceTable);
          ++correction_index) {
+      if (params->override_suggestions->GetSize() == kUrlCorrectionsToDisplay) {

[mmenke, 2016/02/18 19:51:19]

Think this should be >=, for clarity.  Also, this seems to be in the wrong
place.  It should be before this loop, next to the url_correction.empty() check
- this loop is looking up what to do for the current correction, it's not
looping through all the corrections.  Note that it already has a "break;" as the
last line.

[edwardjung, 2016/02/19 18:18:22]

Thanks for spotting this. 

I actually needed to use continue rather than break as there is no guarantee of
the suggestion order.

+        break;
+      }

[mmenke, 2016/02/18 19:51:19]

Remove braces

[edwardjung, 2016/02/19 18:18:22]

Done.

       if ((*it)->correction_type !=
               kCorrectionResourceTable[correction_index].correction_type) {
         continue;
       }
       base::DictionaryValue* suggest = new base::DictionaryValue();
-      suggest->SetString("header",
+      suggest->SetString("summary",
           l10n_util::GetStringUTF16(
               kCorrectionResourceTable[correction_index].resource_id));
       suggest->SetString("urlCorrection", (*it)->url_correction);
       suggest->SetString(
           "urlCorrectionForDisplay",
           FormatURLForDisplay(GURL((*it)->url_correction), is_rtl,
                               accept_languages));
       suggest->SetString("originalUrlForDisplay", original_url_for_display);
       suggest->SetInteger("trackingId", tracking_id);
       suggest->SetInteger("type", static_cast<int>(correction_index));
@@ skipping 721 matching lines @@
 
 OfflinePageStatus NetErrorHelperCore::GetOfflinePageStatus() const {
 #if defined(OS_ANDROID)
   return offline_page_status_;
 #else
   return OfflinePageStatus::NONE;
 #endif  // defined(OS_ANDROID)
 }
 
 }  // namespace error_page