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

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 6 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
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 class PushMessagingDispatcher; 79 class PushMessagingDispatcher;
80 class RendererAccessibility; 80 class RendererAccessibility;
81 class RendererCdmManager; 81 class RendererCdmManager;
82 class RendererMediaPlayerManager; 82 class RendererMediaPlayerManager;
83 class RendererPpapiHost; 83 class RendererPpapiHost;
84 class RenderFrameObserver; 84 class RenderFrameObserver;
85 class RenderViewImpl; 85 class RenderViewImpl;
86 class RenderWidget; 86 class RenderWidget;
87 class RenderWidgetFullscreenPepper; 87 class RenderWidgetFullscreenPepper;
88 class ScreenOrientationDispatcher; 88 class ScreenOrientationDispatcher;
89 class SpeechRecognitionDispatcher;
89 class UserMediaClientImpl; 90 class UserMediaClientImpl;
90 struct CommitNavigationParams; 91 struct CommitNavigationParams;
91 struct CommonNavigationParams; 92 struct CommonNavigationParams;
92 struct CustomContextMenuContext; 93 struct CustomContextMenuContext;
93 struct FrameReplicationState; 94 struct FrameReplicationState;
94 struct RequestNavigationParams; 95 struct RequestNavigationParams;
95 struct ResourceResponseHead; 96 struct ResourceResponseHead;
96 97
97 class CONTENT_EXPORT RenderFrameImpl 98 class CONTENT_EXPORT RenderFrameImpl
98 : public RenderFrame, 99 : public RenderFrame,
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 virtual void postAccessibilityEvent(const blink::WebAXObject& obj, 471 virtual void postAccessibilityEvent(const blink::WebAXObject& obj,
471 blink::WebAXEvent event); 472 blink::WebAXEvent event);
472 virtual void handleAccessibilityFindInPageResult( 473 virtual void handleAccessibilityFindInPageResult(
473 int identifier, 474 int identifier,
474 int match_index, 475 int match_index,
475 const blink::WebAXObject& start_object, 476 const blink::WebAXObject& start_object,
476 int start_offset, 477 int start_offset,
477 const blink::WebAXObject& end_object, 478 const blink::WebAXObject& end_object,
478 int end_offset); 479 int end_offset);
479 virtual void didChangeManifest(blink::WebLocalFrame*); 480 virtual void didChangeManifest(blink::WebLocalFrame*);
481 virtual blink::WebSpeechRecognizer* speechRecognizer();
480 482
481 // WebMediaPlayerDelegate implementation: 483 // WebMediaPlayerDelegate implementation:
482 void DidPlay(blink::WebMediaPlayer* player) override; 484 void DidPlay(blink::WebMediaPlayer* player) override;
483 void DidPause(blink::WebMediaPlayer* player) override; 485 void DidPause(blink::WebMediaPlayer* player) override;
484 void PlayerGone(blink::WebMediaPlayer* player) override; 486 void PlayerGone(blink::WebMediaPlayer* player) override;
485 487
486 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move 488 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
487 // this back to private member. 489 // this back to private member.
488 void OnNavigate(const FrameMsg_Navigate_Params& params); 490 void OnNavigate(const FrameMsg_Navigate_Params& params);
489 491
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 ServiceRegistryImpl service_registry_; 797 ServiceRegistryImpl service_registry_;
796 798
797 // The screen orientation dispatcher attached to the frame, lazily 799 // The screen orientation dispatcher attached to the frame, lazily
798 // initialized. 800 // initialized.
799 ScreenOrientationDispatcher* screen_orientation_dispatcher_; 801 ScreenOrientationDispatcher* screen_orientation_dispatcher_;
800 802
801 // The Manifest Manager handles the manifest requests from the browser 803 // The Manifest Manager handles the manifest requests from the browser
802 // process. 804 // process.
803 ManifestManager* manifest_manager_; 805 ManifestManager* manifest_manager_;
804 806
807 // The speech recognition dispatcher attached to this frame, lazily
808 // initialized.
809 SpeechRecognitionDispatcher* speech_recognition_dispatcher_;
810
805 // The current accessibility mode. 811 // The current accessibility mode.
806 AccessibilityMode accessibility_mode_; 812 AccessibilityMode accessibility_mode_;
807 813
808 // Only valid if |accessibility_mode_| is anything other than 814 // Only valid if |accessibility_mode_| is anything other than
809 // AccessibilityModeOff. 815 // AccessibilityModeOff.
810 RendererAccessibility* renderer_accessibility_; 816 RendererAccessibility* renderer_accessibility_;
811 817
812 #if defined(OS_MACOSX) || defined(OS_ANDROID) 818 #if defined(OS_MACOSX) || defined(OS_ANDROID)
813 // The external popup for the currently showing select popup. 819 // The external popup for the currently showing select popup.
814 scoped_ptr<ExternalPopupMenu> external_popup_menu_; 820 scoped_ptr<ExternalPopupMenu> external_popup_menu_;
815 #endif 821 #endif
816 822
817 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 823 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
818 824
819 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 825 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
820 }; 826 };
821 827
822 } // namespace content 828 } // namespace content
823 829
824 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 830 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698