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

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

Issue 1879613003: Convert //components/dom_distiller from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // The isolated world that the distiller object should be written to. 45 // The isolated world that the distiller object should be written to.
46 int distiller_isolated_world_id_; 46 int distiller_isolated_world_id_;
47 47
48 // Track if the current page is distilled. This is needed for testing. 48 // Track if the current page is distilled. This is needed for testing.
49 bool is_distiller_page_; 49 bool is_distiller_page_;
50 50
51 //mojo::StrongBinding<DistillerPageNotifierService> binding_; 51 //mojo::StrongBinding<DistillerPageNotifierService> binding_;
52 52
53 // Handle to "distiller" JavaScript object functionality. 53 // Handle to "distiller" JavaScript object functionality.
54 scoped_ptr<DistillerNativeJavaScript> native_javascript_handle_; 54 std::unique_ptr<DistillerNativeJavaScript> native_javascript_handle_;
55 base::WeakPtrFactory<DistillerJsRenderFrameObserver> weak_factory_; 55 base::WeakPtrFactory<DistillerJsRenderFrameObserver> weak_factory_;
56 }; 56 };
57 57
58 } // namespace dom_distiller 58 } // namespace dom_distiller
59 59
60 #endif // COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_O BSERVER_H_ 60 #endif // COMPONENTS_DOM_DISTILLER_CONTENT_RENDERER_DISTILLER_JS_RENDER_FRAME_O BSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698