Chromium Code Reviews| 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..a41d378d3191b6a7d8f21c5de4bbbe017f593b60 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.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::Renderer { |
|
nigeltao1
2016/11/27 01:15:49
Should this be
NON_EXPORTED_BASE(public chrome::m
Ken Rockot(use gerrit already)
2016/11/29 23:20:09
That's only relevant if the inheriting class is ex
|
| public: |
| ChromeRenderThreadObserver(); |
| ~ChromeRenderThreadObserver() override; |
| @@ -49,6 +52,8 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver, |
| private: |
| // content::RenderThreadObserver: |
| + void RegisterMojoInterfaces( |
| + content::AssociatedInterfaceRegistry* associated_interfaces) override; |
| bool OnControlMessageReceived(const IPC::Message& message) override; |
| void OnRenderProcessShutdown() override; |
| @@ -56,7 +61,13 @@ 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::Renderer: |
| + void InitialConfiguration( |
| + chrome::mojom::InitialConfigurationParamsPtr params) override; |
| + |
| + void OnRendererInterfaceRequest( |
| + chrome::mojom::RendererAssociatedRequest request); |
| + |
| void OnSetContentSettingsForCurrentURL( |
| const GURL& url, const ContentSettings& content_settings); |
| void OnSetContentSettingRules(const RendererContentSettingRules& rules); |
| @@ -71,6 +82,8 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver, |
| std::unique_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_; |
| + mojo::AssociatedBinding<chrome::mojom::Renderer> renderer_binding_; |
| + |
| base::WeakPtrFactory<ChromeRenderThreadObserver> weak_factory_; |
| DISALLOW_COPY_AND_ASSIGN(ChromeRenderThreadObserver); |