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

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

Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 11 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 class PushMessagingDispatcher; 83 class PushMessagingDispatcher;
84 class RendererAccessibility; 84 class RendererAccessibility;
85 class RendererCdmManager; 85 class RendererCdmManager;
86 class RendererMediaPlayerManager; 86 class RendererMediaPlayerManager;
87 class RendererPpapiHost; 87 class RendererPpapiHost;
88 class RenderFrameObserver; 88 class RenderFrameObserver;
89 class RenderViewImpl; 89 class RenderViewImpl;
90 class RenderWidget; 90 class RenderWidget;
91 class RenderWidgetFullscreenPepper; 91 class RenderWidgetFullscreenPepper;
92 class ScreenOrientationDispatcher; 92 class ScreenOrientationDispatcher;
93 class SpeechRecognitionDispatcher;
93 class UserMediaClientImpl; 94 class UserMediaClientImpl;
94 enum class SandboxFlags; 95 enum class SandboxFlags;
95 struct CommitNavigationParams; 96 struct CommitNavigationParams;
96 struct CommonNavigationParams; 97 struct CommonNavigationParams;
97 struct CustomContextMenuContext; 98 struct CustomContextMenuContext;
98 struct FrameReplicationState; 99 struct FrameReplicationState;
99 struct RequestNavigationParams; 100 struct RequestNavigationParams;
100 struct ResourceResponseHead; 101 struct ResourceResponseHead;
101 102
102 class CONTENT_EXPORT RenderFrameImpl 103 class CONTENT_EXPORT RenderFrameImpl
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 virtual void postAccessibilityEvent(const blink::WebAXObject& obj, 502 virtual void postAccessibilityEvent(const blink::WebAXObject& obj,
502 blink::WebAXEvent event); 503 blink::WebAXEvent event);
503 virtual void handleAccessibilityFindInPageResult( 504 virtual void handleAccessibilityFindInPageResult(
504 int identifier, 505 int identifier,
505 int match_index, 506 int match_index,
506 const blink::WebAXObject& start_object, 507 const blink::WebAXObject& start_object,
507 int start_offset, 508 int start_offset,
508 const blink::WebAXObject& end_object, 509 const blink::WebAXObject& end_object,
509 int end_offset); 510 int end_offset);
510 virtual void didChangeManifest(blink::WebLocalFrame*); 511 virtual void didChangeManifest(blink::WebLocalFrame*);
512 virtual blink::WebSpeechRecognizer* speechRecognizer();
511 513
512 // WebMediaPlayerDelegate implementation: 514 // WebMediaPlayerDelegate implementation:
513 void DidPlay(blink::WebMediaPlayer* player) override; 515 void DidPlay(blink::WebMediaPlayer* player) override;
514 void DidPause(blink::WebMediaPlayer* player) override; 516 void DidPause(blink::WebMediaPlayer* player) override;
515 void PlayerGone(blink::WebMediaPlayer* player) override; 517 void PlayerGone(blink::WebMediaPlayer* player) override;
516 518
517 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move 519 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
518 // this back to private member. 520 // this back to private member.
519 void OnNavigate(const FrameMsg_Navigate_Params& params); 521 void OnNavigate(const FrameMsg_Navigate_Params& params);
520 522
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 ServiceRegistryImpl service_registry_; 832 ServiceRegistryImpl service_registry_;
831 833
832 // The screen orientation dispatcher attached to the frame, lazily 834 // The screen orientation dispatcher attached to the frame, lazily
833 // initialized. 835 // initialized.
834 ScreenOrientationDispatcher* screen_orientation_dispatcher_; 836 ScreenOrientationDispatcher* screen_orientation_dispatcher_;
835 837
836 // The Manifest Manager handles the manifest requests from the browser 838 // The Manifest Manager handles the manifest requests from the browser
837 // process. 839 // process.
838 ManifestManager* manifest_manager_; 840 ManifestManager* manifest_manager_;
839 841
842 // The speech recognition dispatcher attached to this frame, lazily
843 // initialized.
844 SpeechRecognitionDispatcher* speech_recognition_dispatcher_;
845
840 // The current accessibility mode. 846 // The current accessibility mode.
841 AccessibilityMode accessibility_mode_; 847 AccessibilityMode accessibility_mode_;
842 848
843 // Only valid if |accessibility_mode_| is anything other than 849 // Only valid if |accessibility_mode_| is anything other than
844 // AccessibilityModeOff. 850 // AccessibilityModeOff.
845 RendererAccessibility* renderer_accessibility_; 851 RendererAccessibility* renderer_accessibility_;
846 852
847 #if defined(OS_MACOSX) || defined(OS_ANDROID) 853 #if defined(OS_MACOSX) || defined(OS_ANDROID)
848 // The external popup for the currently showing select popup. 854 // The external popup for the currently showing select popup.
849 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 855 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
850 #endif 856 #endif
851 857
852 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 858 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
853 859
854 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 860 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
855 }; 861 };
856 862
857 } // namespace content 863 } // namespace content
858 864
859 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 865 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/test/fake_speech_recognition_manager.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698