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

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

Powered by Google App Engine
This is Rietveld 408576698