Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: components/dom_distiller/content/renderer/distiller_js_render_frame_observer.h

Issue 2851173004: Eliminate bind callback that doesn't take a BindSourceInfo parameter. (Closed)
Patch Set: . Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_OBSE RVER_H_ 5 #ifndef COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_OBSE RVER_H_
6 #define COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_OBSE RVER_H_ 6 #define COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_OBSE RVER_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "components/dom_distiller/content/common/distiller_javascript_service.m ojom.h" 9 #include "components/dom_distiller/content/common/distiller_javascript_service.m ojom.h"
10 #include "components/dom_distiller/content/renderer/distiller_native_javascript. h" 10 #include "components/dom_distiller/content/renderer/distiller_native_javascript. h"
11 #include "components/dom_distiller/content/renderer/distiller_page_notifier_serv ice_impl.h" 11 #include "components/dom_distiller/content/renderer/distiller_page_notifier_serv ice_impl.h"
12 #include "content/public/renderer/render_frame.h" 12 #include "content/public/renderer/render_frame.h"
13 #include "content/public/renderer/render_frame_observer.h" 13 #include "content/public/renderer/render_frame_observer.h"
14 #include "services/service_manager/public/cpp/bind_source_info.h"
14 #include "third_party/WebKit/public/web/WebLocalFrame.h" 15 #include "third_party/WebKit/public/web/WebLocalFrame.h"
15 #include "v8/include/v8.h" 16 #include "v8/include/v8.h"
16 17
17 namespace dom_distiller { 18 namespace dom_distiller {
18 19
19 // DistillerJsRenderFrame observer waits for a page to be loaded and then 20 // DistillerJsRenderFrame observer waits for a page to be loaded and then
20 // tried to connect to a mojo service hosted in the browser process. The 21 // tried to connect to a mojo service hosted in the browser process. The
21 // service will tell this render process if the current page is a distiller 22 // service will tell this render process if the current page is a distiller
22 // page. 23 // page.
23 class DistillerJsRenderFrameObserver : public content::RenderFrameObserver { 24 class DistillerJsRenderFrameObserver : public content::RenderFrameObserver {
24 public: 25 public:
25 DistillerJsRenderFrameObserver(content::RenderFrame* render_frame, 26 DistillerJsRenderFrameObserver(content::RenderFrame* render_frame,
26 const int distiller_isolated_world_id); 27 const int distiller_isolated_world_id);
27 ~DistillerJsRenderFrameObserver() override; 28 ~DistillerJsRenderFrameObserver() override;
28 29
29 // RenderFrameObserver implementation. 30 // RenderFrameObserver implementation.
30 void DidStartProvisionalLoad(blink::WebDataSource* data_source) override; 31 void DidStartProvisionalLoad(blink::WebDataSource* data_source) override;
31 void DidFinishLoad() override; 32 void DidFinishLoad() override;
32 void DidCreateScriptContext(v8::Local<v8::Context> context, 33 void DidCreateScriptContext(v8::Local<v8::Context> context,
33 int world_id) override; 34 int world_id) override;
34 35
35 // Add the mojo interface to a RenderFrame's 36 // Add the mojo interface to a RenderFrame's
36 // service_manager::InterfaceRegistry. 37 // service_manager::InterfaceRegistry.
37 void RegisterMojoInterface(); 38 void RegisterMojoInterface();
38 // Flag the current page as a distiller page. 39 // Flag the current page as a distiller page.
39 void SetIsDistillerPage(); 40 void SetIsDistillerPage();
40 41
41 private: 42 private:
42 void CreateDistillerPageNotifierService( 43 void CreateDistillerPageNotifierService(
43 mojo::InterfaceRequest<mojom::DistillerPageNotifierService> request); 44 const service_manager::BindSourceInfo& source_info,
45 mojom::DistillerPageNotifierServiceRequest request);
44 46
45 // RenderFrameObserver implementation. 47 // RenderFrameObserver implementation.
46 void OnDestruct() override; 48 void OnDestruct() override;
47 49
48 // The isolated world that the distiller object should be written to. 50 // The isolated world that the distiller object should be written to.
49 int distiller_isolated_world_id_; 51 int distiller_isolated_world_id_;
50 52
51 // Track if the current page is distilled. This is needed for testing. 53 // Track if the current page is distilled. This is needed for testing.
52 bool is_distiller_page_; 54 bool is_distiller_page_;
53 55
54 // Handle to "distiller" JavaScript object functionality. 56 // Handle to "distiller" JavaScript object functionality.
55 std::unique_ptr<DistillerNativeJavaScript> native_javascript_handle_; 57 std::unique_ptr<DistillerNativeJavaScript> native_javascript_handle_;
56 base::WeakPtrFactory<DistillerJsRenderFrameObserver> weak_factory_; 58 base::WeakPtrFactory<DistillerJsRenderFrameObserver> weak_factory_;
57 }; 59 };
58 60
59 } // namespace dom_distiller 61 } // namespace dom_distiller
60 62
61 #endif // COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_O BSERVER_H_ 63 #endif // COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_O BSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698