Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / localized_error.h

diff --git a/src/chrome/common/localized_error.h b/src/chrome/common/localized_error.h
index b4d69ff..94caed6 100644 (file)
--- a/src/chrome/common/localized_error.h
+++ b/src/chrome/common/localized_error.h
@@ -25,30 +25,12 @@ namespace blink {
 struct WebURLError;
 }
 
+namespace error_page {
+struct ErrorPageParams;
+}
+
 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;
-    int reload_tracking_id;
-
-    // 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;
-    int search_tracking_id;
-  };
-
   // 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,
@@ -58,7 +40,7 @@ class LocalizedError {
                          bool show_stale_load_button,
                          const std::string& locale,
                          const std::string& accept_languages,
-                         scoped_ptr<ErrorPageParams> params,
+                         scoped_ptr<error_page::ErrorPageParams> params,
                          base::DictionaryValue* strings);
 
   // Returns a description of the encountered error.
@@ -68,6 +50,7 @@ class LocalizedError {
   // Returns true if an error page exists for the specified parameters.
   static bool HasStrings(const std::string& error_domain, int error_code);
 
+#if defined(ENABLE_EXTENSIONS)
   // Fills |error_strings| with values to be used to build an error page used
   // on HTTP errors, like 404 or connection reset, but using information from
   // the associated |app| in order to make the error page look like it's more
@@ -75,6 +58,7 @@ class LocalizedError {
   static void GetAppErrorStrings(const GURL& display_url,
                                  const extensions::Extension* app,
                                  base::DictionaryValue* error_strings);
+#endif
 
   static const char kHttpErrorDomain[];