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

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

Powered by Google App Engine
This is Rietveld 408576698