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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1023783004: [DevTools] Move DevToolsAgent to RenderFrameImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 namespace media { 68 namespace media {
69 class MediaPermission; 69 class MediaPermission;
70 class WebEncryptedMediaClientImpl; 70 class WebEncryptedMediaClientImpl;
71 } 71 }
72 72
73 namespace content { 73 namespace content {
74 74
75 class ChildFrameCompositingHelper; 75 class ChildFrameCompositingHelper;
76 class CompositorDependencies; 76 class CompositorDependencies;
77 class DevToolsAgent;
77 class ExternalPopupMenu; 78 class ExternalPopupMenu;
78 class GeolocationDispatcher; 79 class GeolocationDispatcher;
79 class ManifestManager; 80 class ManifestManager;
80 class MediaStreamDispatcher; 81 class MediaStreamDispatcher;
81 class MediaStreamRendererFactory; 82 class MediaStreamRendererFactory;
82 class MediaPermissionDispatcher; 83 class MediaPermissionDispatcher;
83 class MidiDispatcher; 84 class MidiDispatcher;
84 class NotificationPermissionDispatcher; 85 class NotificationPermissionDispatcher;
85 class PageState; 86 class PageState;
86 class PepperPluginInstanceImpl; 87 class PepperPluginInstanceImpl;
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 // TODO(nasko): Remove this method once swapped out state is no longer used. 541 // TODO(nasko): Remove this method once swapped out state is no longer used.
541 void NavigateToSwappedOutURL(); 542 void NavigateToSwappedOutURL();
542 543
543 // Binds this render frame's service registry. 544 // Binds this render frame's service registry.
544 void BindServiceRegistry( 545 void BindServiceRegistry(
545 mojo::InterfaceRequest<mojo::ServiceProvider> services, 546 mojo::InterfaceRequest<mojo::ServiceProvider> services,
546 mojo::ServiceProviderPtr exposed_services); 547 mojo::ServiceProviderPtr exposed_services);
547 548
548 ManifestManager* manifest_manager(); 549 ManifestManager* manifest_manager();
549 550
551 void CreateDevToolsAgent();
552
550 protected: 553 protected:
551 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); 554 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
552 555
553 private: 556 private:
554 friend class RenderFrameObserver; 557 friend class RenderFrameObserver;
555 friend class RendererAccessibilityTest; 558 friend class RendererAccessibilityTest;
556 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem); 559 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem);
557 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); 560 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange);
558 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); 561 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase);
559 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); 562 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 // RenderFrameObserver. 849 // RenderFrameObserver.
847 RendererCdmManager* cdm_manager_; 850 RendererCdmManager* cdm_manager_;
848 #endif 851 #endif
849 852
850 #if defined(VIDEO_HOLE) 853 #if defined(VIDEO_HOLE)
851 // Whether or not this RenderFrameImpl contains a media player. Used to 854 // Whether or not this RenderFrameImpl contains a media player. Used to
852 // register as an observer for video-hole-specific events. 855 // register as an observer for video-hole-specific events.
853 bool contains_media_player_; 856 bool contains_media_player_;
854 #endif 857 #endif
855 858
859 // The devtools agent for this frame, only created for local frame roots.
Charlie Reis 2015/03/24 17:25:13 nit: period or semicolon, not comma.
dgozman 2015/03/25 16:25:50 Done.
860 DevToolsAgent* devtools_agent_;
861
856 // The geolocation dispatcher attached to this frame, lazily initialized. 862 // The geolocation dispatcher attached to this frame, lazily initialized.
857 GeolocationDispatcher* geolocation_dispatcher_; 863 GeolocationDispatcher* geolocation_dispatcher_;
858 864
859 // The push messaging dispatcher attached to this frame, lazily initialized. 865 // The push messaging dispatcher attached to this frame, lazily initialized.
860 PushMessagingDispatcher* push_messaging_dispatcher_; 866 PushMessagingDispatcher* push_messaging_dispatcher_;
861 867
862 // The presentation dispatcher implementation attached to this frame, lazily 868 // The presentation dispatcher implementation attached to this frame, lazily
863 // initialized. 869 // initialized.
864 PresentationDispatcher* presentation_dispatcher_; 870 PresentationDispatcher* presentation_dispatcher_;
865 871
(...skipping 22 matching lines...) Expand all
888 #endif 894 #endif
889 895
890 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 896 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
891 897
892 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 898 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
893 }; 899 };
894 900
895 } // namespace content 901 } // namespace content
896 902
897 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 903 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698