Revert 262846, as the revert has now been merged to M35.

trunk/src/chrome/common/localized_error.h

Index: trunk/src/chrome/common/localized_error.h
===================================================================
--- trunk/src/chrome/common/localized_error.h	(revision 263955)
+++ trunk/src/chrome/common/localized_error.h	(working copy)
@@ -8,12 +8,13 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "url/gurl.h"
 
-class GURL;
-
 namespace base {
 class DictionaryValue;
+class ListValue;
 }
 
 namespace extensions {
@@ -26,6 +27,26 @@
 
 class LocalizedError {
  public:
+  // Optional parameters that affect the display of an error page.
+  struct ErrorPageParams {
+    ErrorPageParams();
+    ~ErrorPageParams();
+
+    // Overrides whether reloading is suggested.
+    bool suggest_reload;
+
+    // Overrides default suggestions.  Each entry must contain a header and may
+    // optionally contain a body as well.  Must not be NULL.
+    scoped_ptr<base::ListValue> override_suggestions;
+
+    // Prefix to prepend to search terms.  Search box is only shown if this is
+    // a valid url.  The search terms will be appended to the end of this URL to
+    // conduct a search.
+    GURL search_url;
+    // Default search terms.  Ignored if |search_url| is invalid.
+    std::string search_terms;
+  };
+
   // Fills |error_strings| with values to be used to build an error page used
   // on HTTP errors, like 404 or connection reset.
   static void GetStrings(int error_code,
@@ -35,6 +56,7 @@
                          bool stale_copy_in_cache,
                          const std::string& locale,
                          const std::string& accept_languages,
+                         scoped_ptr<ErrorPageParams> params,
                          base::DictionaryValue* strings);
 
   // Returns a description of the encountered error.