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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 2576613003: Minor, unrelated changes from the browser side mixed-content patch. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « chrome/common/render_messages.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 1081
1082 // Hosts media::mojom::InterfaceFactory for the RenderFrame and forwards 1082 // Hosts media::mojom::InterfaceFactory for the RenderFrame and forwards
1083 // media::mojom::InterfaceFactory calls to the remote "media" service. 1083 // media::mojom::InterfaceFactory calls to the remote "media" service.
1084 std::unique_ptr<MediaInterfaceProxy> media_interface_proxy_; 1084 std::unique_ptr<MediaInterfaceProxy> media_interface_proxy_;
1085 1085
1086 std::vector<std::unique_ptr<service_manager::InterfaceRegistry>> 1086 std::vector<std::unique_ptr<service_manager::InterfaceRegistry>>
1087 media_registries_; 1087 media_registries_;
1088 1088
1089 std::unique_ptr<AssociatedInterfaceProviderImpl> 1089 std::unique_ptr<AssociatedInterfaceProviderImpl>
1090 remote_associated_interfaces_; 1090 remote_associated_interfaces_;
1091
1091 // NOTE: This must be the last member. 1092 // NOTE: This must be the last member.
1092 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1093 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1093 1094
1094 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1095 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1095 }; 1096 };
1096 1097
1097 } // namespace content 1098 } // namespace content
1098 1099
1099 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1100 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698