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

Side by Side Diff: content/browser/web_contents/web_contents_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/containers/scoped_ptr_hash_map.h" 13 #include "base/containers/scoped_ptr_hash_map.h"
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "base/process/process.h" 17 #include "base/process/process.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "content/browser/frame_host/frame_tree.h" 19 #include "content/browser/frame_host/frame_tree.h"
20 #include "content/browser/frame_host/navigation_controller_delegate.h" 20 #include "content/browser/frame_host/navigation_controller_delegate.h"
21 #include "content/browser/frame_host/navigation_controller_impl.h" 21 #include "content/browser/frame_host/navigation_controller_impl.h"
22 #include "content/browser/frame_host/navigator_delegate.h" 22 #include "content/browser/frame_host/navigator_delegate.h"
23 #include "content/browser/frame_host/render_frame_host_delegate.h" 23 #include "content/browser/frame_host/render_frame_host_delegate.h"
24 #include "content/browser/frame_host/render_frame_host_manager.h" 24 #include "content/browser/frame_host/render_frame_host_manager.h"
25 #include "content/browser/media/audio_stream_monitor.h" 25 #include "content/browser/media/audio_stream_monitor.h"
26 #include "content/browser/renderer_host/render_view_host_delegate.h" 26 #include "content/browser/renderer_host/render_view_host_delegate.h"
27 #include "content/browser/renderer_host/render_widget_host_delegate.h" 27 #include "content/browser/renderer_host/render_widget_host_delegate.h"
28 #include "content/common/accessibility_mode_enums.h" 28 #include "content/common/accessibility_mode_enums.h"
29 #include "content/common/content_export.h" 29 #include "content/common/content_export.h"
30 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/color_chooser.h" 31 #include "content/public/browser/color_chooser.h"
31 #include "content/public/browser/notification_observer.h" 32 #include "content/public/browser/notification_observer.h"
32 #include "content/public/browser/notification_registrar.h" 33 #include "content/public/browser/notification_registrar.h"
33 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
34 #include "content/public/common/renderer_preferences.h" 35 #include "content/public/common/renderer_preferences.h"
35 #include "content/public/common/resource_type.h" 36 #include "content/public/common/resource_type.h"
36 #include "content/public/common/three_d_api_types.h" 37 #include "content/public/common/three_d_api_types.h"
37 #include "net/base/load_states.h" 38 #include "net/base/load_states.h"
38 #include "net/http/http_response_headers.h" 39 #include "net/http/http_response_headers.h"
39 #include "third_party/WebKit/public/web/WebDragOperation.h" 40 #include "third_party/WebKit/public/web/WebDragOperation.h"
(...skipping 16 matching lines...) Expand all
56 class JavaScriptDialogManager; 57 class JavaScriptDialogManager;
57 class ManifestManagerHost; 58 class ManifestManagerHost;
58 class PluginContentOriginWhitelist; 59 class PluginContentOriginWhitelist;
59 class PowerSaveBlocker; 60 class PowerSaveBlocker;
60 class RenderViewHost; 61 class RenderViewHost;
61 class RenderViewHostDelegateView; 62 class RenderViewHostDelegateView;
62 class RenderViewHostImpl; 63 class RenderViewHostImpl;
63 class RenderWidgetHostImpl; 64 class RenderWidgetHostImpl;
64 class SavePackage; 65 class SavePackage;
65 class ScreenOrientationDispatcherHost; 66 class ScreenOrientationDispatcherHost;
67 class SpeechRecognitionDispatcherHost;
66 class SiteInstance; 68 class SiteInstance;
67 class TestWebContents; 69 class TestWebContents;
68 class WebContentsAudioMuter; 70 class WebContentsAudioMuter;
69 class WebContentsDelegate; 71 class WebContentsDelegate;
70 class WebContentsImpl; 72 class WebContentsImpl;
71 class WebContentsObserver; 73 class WebContentsObserver;
72 class WebContentsView; 74 class WebContentsView;
73 class WebContentsViewDelegate; 75 class WebContentsViewDelegate;
74 struct AXEventNotificationDetails; 76 struct AXEventNotificationDetails;
75 struct ColorSuggestion; 77 struct ColorSuggestion;
(...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1210 // Whether the last JavaScript dialog shown was suppressed. Used for testing. 1212 // Whether the last JavaScript dialog shown was suppressed. Used for testing.
1211 bool last_dialog_suppressed_; 1213 bool last_dialog_suppressed_;
1212 1214
1213 scoped_ptr<GeolocationServiceContext> geolocation_service_context_; 1215 scoped_ptr<GeolocationServiceContext> geolocation_service_context_;
1214 1216
1215 scoped_ptr<ScreenOrientationDispatcherHost> 1217 scoped_ptr<ScreenOrientationDispatcherHost>
1216 screen_orientation_dispatcher_host_; 1218 screen_orientation_dispatcher_host_;
1217 1219
1218 scoped_ptr<ManifestManagerHost> manifest_manager_host_; 1220 scoped_ptr<ManifestManagerHost> manifest_manager_host_;
1219 1221
1222 scoped_ptr<SpeechRecognitionDispatcherHost, BrowserThread::DeleteOnIOThread>
1223 speech_recognition_dispatcher_host_;
1224
1220 // The accessibility mode for all frames. This is queried when each frame 1225 // The accessibility mode for all frames. This is queried when each frame
1221 // is created, and broadcast to all frames when it changes. 1226 // is created, and broadcast to all frames when it changes.
1222 AccessibilityMode accessibility_mode_; 1227 AccessibilityMode accessibility_mode_;
1223 1228
1224 // Monitors power levels for audio streams associated with this WebContents. 1229 // Monitors power levels for audio streams associated with this WebContents.
1225 AudioStreamMonitor audio_stream_monitor_; 1230 AudioStreamMonitor audio_stream_monitor_;
1226 1231
1227 // Created on-demand to mute all audio output from this WebContents. 1232 // Created on-demand to mute all audio output from this WebContents.
1228 scoped_ptr<WebContentsAudioMuter> audio_muter_; 1233 scoped_ptr<WebContentsAudioMuter> audio_muter_;
1229 1234
1230 bool virtual_keyboard_requested_; 1235 bool virtual_keyboard_requested_;
1231 1236
1232 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1237 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1233 1238
1234 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1239 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1235 }; 1240 };
1236 1241
1237 } // namespace content 1242 } // namespace content
1238 1243
1239 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1244 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698