diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/renderer/plugins | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/renderer/plugins')
| -rw-r--r-- | chromium/chrome/renderer/plugins/chrome_plugin_placeholder.cc | 6 | ||||
| -rw-r--r-- | chromium/chrome/renderer/plugins/chrome_plugin_placeholder.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.cc index 4410ede5cb6..d662fe9310c 100644 --- a/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.cc +++ b/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.cc @@ -15,7 +15,6 @@ #include "base/values.h" #include "chrome/common/buildflags.h" #include "chrome/common/chrome_features.h" -#include "chrome/common/prerender_messages.h" #include "chrome/common/render_messages.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/renderer_resources.h" @@ -24,6 +23,7 @@ #include "chrome/renderer/plugins/plugin_preroller.h" #include "chrome/renderer/plugins/plugin_uma.h" #include "components/content_settings/renderer/content_settings_agent_impl.h" +#include "components/prerender/common/prerender_messages.h" #include "components/strings/grit/components_strings.h" #include "content/public/common/content_switches.h" #include "content/public/common/untrustworthy_context_menu_params.h" @@ -212,9 +212,9 @@ void ChromePluginPlaceholder::UpdateFailure() { } void ChromePluginPlaceholder::OnSetPrerenderMode( - prerender::PrerenderMode mode, + prerender::mojom::PrerenderMode mode, const std::string& histogram_prefix) { - OnSetIsPrerendering(mode != prerender::NO_PRERENDER); + OnSetIsPrerendering(mode != prerender::mojom::PrerenderMode::kNoPrerender); } void ChromePluginPlaceholder::PluginListChanged() { diff --git a/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.h b/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.h index 738a37a2679..88c7e513e2a 100644 --- a/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.h +++ b/chromium/chrome/renderer/plugins/chrome_plugin_placeholder.h @@ -11,9 +11,9 @@ #include "base/macros.h" #include "chrome/common/buildflags.h" #include "chrome/common/plugin.mojom.h" -#include "chrome/common/prerender_types.h" #include "chrome/renderer/plugins/power_saver_info.h" #include "components/plugins/renderer/loadable_plugin_placeholder.h" +#include "components/prerender/common/prerender_types.mojom.h" #include "content/public/renderer/context_menu_client.h" #include "content/public/renderer/render_thread_observer.h" #include "mojo/public/cpp/bindings/pending_remote.h" @@ -87,7 +87,7 @@ class ChromePluginPlaceholder final void UpdateFailure() override; // IPC message handlers: - void OnSetPrerenderMode(prerender::PrerenderMode mode, + void OnSetPrerenderMode(prerender::mojom::PrerenderMode mode, const std::string& histogram_prefix); chrome::mojom::PluginStatus status_; |