Update to Chromium version 76.0.3809.0 (#665002)

OSR tests will be fixed by a follow-up merge of Viz support (see issue #2575).
This commit is contained in:
Petra Öhlin
2019-07-16 13:59:21 -04:00
committed by Marshall Greenblatt
parent 5892ffc382
commit cc0db5f166
124 changed files with 1312 additions and 1416 deletions

View File

@ -10,7 +10,7 @@
#include "base/files/file_path.h"
#include "extensions/browser/component_extension_resource_manager.h"
struct GzippedGritResourceMap;
struct GritResourceMap;
namespace extensions {
@ -21,21 +21,18 @@ class CefComponentExtensionResourceManager
~CefComponentExtensionResourceManager() override;
// Overridden from ComponentExtensionResourceManager:
bool IsComponentExtensionResource(
const base::FilePath& extension_path,
const base::FilePath& resource_path,
ComponentExtensionResourceInfo* resource_info) const override;
bool IsComponentExtensionResource(const base::FilePath& extension_path,
const base::FilePath& resource_path,
int* resource_id) const override;
const ui::TemplateReplacements* GetTemplateReplacementsForExtension(
const std::string& extension_id) const override;
private:
void AddComponentResourceEntries(const GzippedGritResourceMap* entries,
size_t size);
void AddComponentResourceEntries(const GritResourceMap* entries, size_t size);
// A map from a resource path to the resource ID. Used by
// IsComponentExtensionResource.
std::map<base::FilePath, ComponentExtensionResourceInfo>
path_to_resource_info_;
std::map<base::FilePath, int> path_to_resource_info_;
DISALLOW_COPY_AND_ASSIGN(CefComponentExtensionResourceManager);
};