summaryrefslogtreecommitdiffstats
path: root/src/core/extensions
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-07 11:35:08 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-23 00:24:54 +0000
commitce6a1a74d16deecf0c150aa1f5bae2cc6a95e7b1 (patch)
treee1ce3f92b50c0c0e5140019134e70e70a1ddb88d /src/core/extensions
parent5c6201f6c393967e9284bb9841281d286126541d (diff)
Adaptations for Chromium 73
Change-Id: I565d1e327852110a5abebed3388d7cd6986bef06 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/extensions')
-rw-r--r--src/core/extensions/component_extension_resource_manager_qt.cpp5
-rw-r--r--src/core/extensions/component_extension_resource_manager_qt.h1
-rw-r--r--src/core/extensions/extension_web_contents_observer_qt.cpp2
-rw-r--r--src/core/extensions/extension_web_contents_observer_qt.h1
4 files changed, 9 insertions, 0 deletions
diff --git a/src/core/extensions/component_extension_resource_manager_qt.cpp b/src/core/extensions/component_extension_resource_manager_qt.cpp
index d8326400e..57e35c231 100644
--- a/src/core/extensions/component_extension_resource_manager_qt.cpp
+++ b/src/core/extensions/component_extension_resource_manager_qt.cpp
@@ -80,6 +80,11 @@ bool ComponentExtensionResourceManagerQt::IsComponentExtensionResource(const bas
return entry != path_to_resource_id_.end();
}
+const ui::TemplateReplacements *ComponentExtensionResourceManagerQt::GetTemplateReplacementsForExtension(const std::string &) const
+{
+ return nullptr;
+}
+
void ComponentExtensionResourceManagerQt::AddComponentResourceEntries(const GritResourceMap *entries, size_t size)
{
for (size_t i = 0; i < size; ++i) {
diff --git a/src/core/extensions/component_extension_resource_manager_qt.h b/src/core/extensions/component_extension_resource_manager_qt.h
index f12edf61e..2d858630f 100644
--- a/src/core/extensions/component_extension_resource_manager_qt.h
+++ b/src/core/extensions/component_extension_resource_manager_qt.h
@@ -63,6 +63,7 @@ public:
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 GritResourceMap* entries, size_t size);
diff --git a/src/core/extensions/extension_web_contents_observer_qt.cpp b/src/core/extensions/extension_web_contents_observer_qt.cpp
index 1eb2298ca..365f04e46 100644
--- a/src/core/extensions/extension_web_contents_observer_qt.cpp
+++ b/src/core/extensions/extension_web_contents_observer_qt.cpp
@@ -121,4 +121,6 @@ void ExtensionWebContentsObserverQt::RenderFrameCreated(content::RenderFrameHost
policy->GrantRequestOrigin(process_id, url::Origin::Create(GURL(content::kChromeUIResourcesURL)));
}
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ExtensionWebContentsObserverQt)
+
} // namespace extensions
diff --git a/src/core/extensions/extension_web_contents_observer_qt.h b/src/core/extensions/extension_web_contents_observer_qt.h
index 043b9d4fa..267a1095c 100644
--- a/src/core/extensions/extension_web_contents_observer_qt.h
+++ b/src/core/extensions/extension_web_contents_observer_qt.h
@@ -67,6 +67,7 @@ public:
private:
friend class content::WebContentsUserData<ExtensionWebContentsObserverQt>;
+ WEB_CONTENTS_USER_DATA_KEY_DECL()
DISALLOW_COPY_AND_ASSIGN(ExtensionWebContentsObserverQt);
};