| Index: chrome/renderer/chrome_render_thread_observer.h
|
| diff --git a/chrome/renderer/chrome_render_thread_observer.h b/chrome/renderer/chrome_render_thread_observer.h
|
| index 06a1daadcd1daeac34d4cfd600495fa7931b7980..7fdf1bad0dc3908d8a68701385a04c60fb6a0ec5 100644
|
| --- a/chrome/renderer/chrome_render_thread_observer.h
|
| +++ b/chrome/renderer/chrome_render_thread_observer.h
|
| @@ -12,9 +12,11 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/metrics/field_trial.h"
|
| +#include "chrome/common/renderer_configuration.mojom.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/variations/child_process_field_trial_syncer.h"
|
| #include "content/public/renderer/render_thread_observer.h"
|
| +#include "mojo/public/cpp/bindings/associated_binding.h"
|
|
|
| class GURL;
|
| struct ContentSettings;
|
| @@ -32,7 +34,8 @@ class VisitedLinkSlave;
|
| // happen. If a few messages are related, they should probably have their own
|
| // observer.
|
| class ChromeRenderThreadObserver : public content::RenderThreadObserver,
|
| - public base::FieldTrialList::Observer {
|
| + public base::FieldTrialList::Observer,
|
| + public chrome::mojom::RendererConfiguration {
|
| public:
|
| ChromeRenderThreadObserver();
|
| ~ChromeRenderThreadObserver() override;
|
| @@ -49,6 +52,10 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
|
|
|
| private:
|
| // content::RenderThreadObserver:
|
| + void RegisterMojoInterfaces(
|
| + content::AssociatedInterfaceRegistry* associated_interfaces) override;
|
| + void UnregisterMojoInterfaces(
|
| + content::AssociatedInterfaceRegistry* associated_interfaces) override;
|
| bool OnControlMessageReceived(const IPC::Message& message) override;
|
| void OnRenderProcessShutdown() override;
|
|
|
| @@ -56,7 +63,12 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
|
| void OnFieldTrialGroupFinalized(const std::string& trial_name,
|
| const std::string& group_name) override;
|
|
|
| - void OnSetIsIncognitoProcess(bool is_incognito_process);
|
| + // chrome::mojom::RendererConfiguration:
|
| + void SetInitialConfiguration(bool is_incognito_process) override;
|
| +
|
| + void OnRendererInterfaceRequest(
|
| + chrome::mojom::RendererConfigurationAssociatedRequest request);
|
| +
|
| void OnSetContentSettingsForCurrentURL(
|
| const GURL& url, const ContentSettings& content_settings);
|
| void OnSetContentSettingRules(const RendererContentSettingRules& rules);
|
| @@ -71,6 +83,9 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
|
|
|
| std::unique_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
|
|
|
| + mojo::AssociatedBinding<chrome::mojom::RendererConfiguration>
|
| + renderer_configuration_binding_;
|
| +
|
| base::WeakPtrFactory<ChromeRenderThreadObserver> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeRenderThreadObserver);
|
|
|