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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 755673002: Update MidiDispatcher to use Mojo Permission Service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 23 matching lines...) Expand all
34 #include "content/browser/frame_host/navigation_entry_impl.h" 34 #include "content/browser/frame_host/navigation_entry_impl.h"
35 #include "content/browser/frame_host/navigator_impl.h" 35 #include "content/browser/frame_host/navigator_impl.h"
36 #include "content/browser/frame_host/render_frame_host_impl.h" 36 #include "content/browser/frame_host/render_frame_host_impl.h"
37 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 37 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
38 #include "content/browser/geolocation/geolocation_service_context.h" 38 #include "content/browser/geolocation/geolocation_service_context.h"
39 #include "content/browser/host_zoom_map_impl.h" 39 #include "content/browser/host_zoom_map_impl.h"
40 #include "content/browser/loader/resource_dispatcher_host_impl.h" 40 #include "content/browser/loader/resource_dispatcher_host_impl.h"
41 #include "content/browser/manifest/manifest_manager_host.h" 41 #include "content/browser/manifest/manifest_manager_host.h"
42 #include "content/browser/media/audio_stream_monitor.h" 42 #include "content/browser/media/audio_stream_monitor.h"
43 #include "content/browser/media/capture/web_contents_audio_muter.h" 43 #include "content/browser/media/capture/web_contents_audio_muter.h"
44 #include "content/browser/media/midi_dispatcher_host.h"
45 #include "content/browser/message_port_message_filter.h" 44 #include "content/browser/message_port_message_filter.h"
46 #include "content/browser/message_port_service.h" 45 #include "content/browser/message_port_service.h"
47 #include "content/browser/plugin_content_origin_whitelist.h" 46 #include "content/browser/plugin_content_origin_whitelist.h"
48 #include "content/browser/power_save_blocker_impl.h" 47 #include "content/browser/power_save_blocker_impl.h"
49 #include "content/browser/renderer_host/render_process_host_impl.h" 48 #include "content/browser/renderer_host/render_process_host_impl.h"
50 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 49 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
51 #include "content/browser/renderer_host/render_view_host_impl.h" 50 #include "content/browser/renderer_host/render_view_host_impl.h"
52 #include "content/browser/renderer_host/render_widget_host_impl.h" 51 #include "content/browser/renderer_host/render_widget_host_impl.h"
53 #include "content/browser/renderer_host/render_widget_host_view_base.h" 52 #include "content/browser/renderer_host/render_widget_host_view_base.h"
54 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h" 53 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h"
(...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 1181
1183 #if defined(ENABLE_PLUGINS) 1182 #if defined(ENABLE_PLUGINS)
1184 plugin_content_origin_whitelist_.reset( 1183 plugin_content_origin_whitelist_.reset(
1185 new PluginContentOriginWhitelist(this)); 1184 new PluginContentOriginWhitelist(this));
1186 #endif 1185 #endif
1187 1186
1188 registrar_.Add(this, 1187 registrar_.Add(this,
1189 NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, 1188 NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
1190 NotificationService::AllBrowserContextsAndSources()); 1189 NotificationService::AllBrowserContextsAndSources());
1191 1190
1192 midi_dispatcher_host_.reset(new MidiDispatcherHost(this));
1193
1194 screen_orientation_dispatcher_host_.reset( 1191 screen_orientation_dispatcher_host_.reset(
1195 new ScreenOrientationDispatcherHostImpl(this)); 1192 new ScreenOrientationDispatcherHostImpl(this));
1196 1193
1197 manifest_manager_host_.reset(new ManifestManagerHost(this)); 1194 manifest_manager_host_.reset(new ManifestManagerHost(this));
1198 1195
1199 #if defined(OS_ANDROID) 1196 #if defined(OS_ANDROID)
1200 date_time_chooser_.reset(new DateTimeChooserAndroid()); 1197 date_time_chooser_.reset(new DateTimeChooserAndroid());
1201 #endif 1198 #endif
1202 } 1199 }
1203 1200
(...skipping 3149 matching lines...) Expand 10 before | Expand all | Expand 10 after
4353 node->render_manager()->ResumeResponseDeferredAtStart(); 4350 node->render_manager()->ResumeResponseDeferredAtStart();
4354 } 4351 }
4355 4352
4356 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4353 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4357 force_disable_overscroll_content_ = force_disable; 4354 force_disable_overscroll_content_ = force_disable;
4358 if (view_) 4355 if (view_)
4359 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4356 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4360 } 4357 }
4361 4358
4362 } // namespace content 4359 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698