Merge to M57: Remove popup overlay from MHTML when requested

components/offline_pages/core/offline_page_archiver.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_ARCHIVER_H_
 #define COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_ARCHIVER_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
@@ skipping 40 matching lines @@
   enum class ArchiverResult {
     SUCCESSFULLY_CREATED,           // Archive created successfully.
     ERROR_DEVICE_FULL,              // Cannot save the archive - device is full.
     ERROR_CANCELED,                 // Caller canceled the request.
     ERROR_CONTENT_UNAVAILABLE,      // Content to archive is not available.
     ERROR_ARCHIVE_CREATION_FAILED,  // Creation of archive failed.
     ERROR_SECURITY_CERTIFICATE,     // Page was loaded on secure connection, but
                                     // there was a security error.
   };
 
+  // Describes the parameters to control how to create an archive.
+  struct CreateArchiveParams {
+    CreateArchiveParams() : remove_popup_overlay(false) {}
+
+    // Whether to remove popup overlay that obstructs viewing normal content.
+    bool remove_popup_overlay;
+  };
+
   typedef base::Callback<void(OfflinePageArchiver* /* archiver */,
                               ArchiverResult /* result */,
                               const GURL& /* url */,
                               const base::FilePath& /* file_path */,
                               const base::string16& /* title */,
                               int64_t /* file_size */)>
       CreateArchiveCallback;
 
   virtual ~OfflinePageArchiver() {}
 
-  // Starts creating the archive in the |archives_dir| with |archive_id| added
-  // to the archive filename. Once archive is created |callback| will be called
+  // Starts creating the archive in the |archives_dir| per
+  // |create_archive_params|. Once archive is created |callback| will be called
   // with the result and additional information.
   virtual void CreateArchive(const base::FilePath& archives_dir,
-                             int64_t archive_id,
+                             const CreateArchiveParams& create_archive_params,
                              const CreateArchiveCallback& callback) = 0;
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_ARCHIVER_H_