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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2820163002: Move MediaDeviceIDSalt from ProfileIOData to ProfileImpl. (Closed)
Patch Set: Fix Created 3 years, 8 months 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 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "content/public/browser/ax_event_notification_details.h" 73 #include "content/public/browser/ax_event_notification_details.h"
74 #include "content/public/browser/browser_accessibility_state.h" 74 #include "content/public/browser/browser_accessibility_state.h"
75 #include "content/public/browser/browser_context.h" 75 #include "content/public/browser/browser_context.h"
76 #include "content/public/browser/browser_plugin_guest_manager.h" 76 #include "content/public/browser/browser_plugin_guest_manager.h"
77 #include "content/public/browser/browser_thread.h" 77 #include "content/public/browser/browser_thread.h"
78 #include "content/public/browser/content_browser_client.h" 78 #include "content/public/browser/content_browser_client.h"
79 #include "content/public/browser/permission_manager.h" 79 #include "content/public/browser/permission_manager.h"
80 #include "content/public/browser/permission_type.h" 80 #include "content/public/browser/permission_type.h"
81 #include "content/public/browser/render_process_host.h" 81 #include "content/public/browser/render_process_host.h"
82 #include "content/public/browser/render_widget_host_view.h" 82 #include "content/public/browser/render_widget_host_view.h"
83 #include "content/public/browser/resource_context.h"
84 #include "content/public/browser/storage_partition.h" 83 #include "content/public/browser/storage_partition.h"
85 #include "content/public/browser/stream_handle.h" 84 #include "content/public/browser/stream_handle.h"
86 #include "content/public/common/bindings_policy.h" 85 #include "content/public/common/bindings_policy.h"
87 #include "content/public/common/browser_side_navigation_policy.h" 86 #include "content/public/common/browser_side_navigation_policy.h"
88 #include "content/public/common/content_constants.h" 87 #include "content/public/common/content_constants.h"
89 #include "content/public/common/content_features.h" 88 #include "content/public/common/content_features.h"
90 #include "content/public/common/content_switches.h" 89 #include "content/public/common/content_switches.h"
91 #include "content/public/common/file_chooser_file_info.h" 90 #include "content/public/common/file_chooser_file_info.h"
92 #include "content/public/common/file_chooser_params.h" 91 #include "content/public/common/file_chooser_params.h"
93 #include "content/public/common/isolated_world_ids.h" 92 #include "content/public/common/isolated_world_ids.h"
(...skipping 2432 matching lines...) Expand 10 before | Expand all | Expand 10 after
2526 // BrowserMainLoop, which owns MediaStreamManager, is alive for the lifetime 2525 // BrowserMainLoop, which owns MediaStreamManager, is alive for the lifetime
2527 // of Mojo communication (see BrowserMainLoop::ShutdownThreadsAndCleanUp(), 2526 // of Mojo communication (see BrowserMainLoop::ShutdownThreadsAndCleanUp(),
2528 // which shuts down Mojo). Hence, passing that MediaStreamManager instance 2527 // which shuts down Mojo). Hence, passing that MediaStreamManager instance
2529 // as a raw pointer here is safe. 2528 // as a raw pointer here is safe.
2530 MediaStreamManager* media_stream_manager = 2529 MediaStreamManager* media_stream_manager =
2531 BrowserMainLoop::GetInstance()->media_stream_manager(); 2530 BrowserMainLoop::GetInstance()->media_stream_manager();
2532 GetInterfaceRegistry()->AddInterface( 2531 GetInterfaceRegistry()->AddInterface(
2533 base::Bind(&MediaDevicesDispatcherHost::Create, GetProcess()->GetID(), 2532 base::Bind(&MediaDevicesDispatcherHost::Create, GetProcess()->GetID(),
2534 GetRoutingID(), GetProcess() 2533 GetRoutingID(), GetProcess()
2535 ->GetBrowserContext() 2534 ->GetBrowserContext()
2536 ->GetResourceContext()
2537 ->GetMediaDeviceIDSalt(), 2535 ->GetMediaDeviceIDSalt(),
2538 base::Unretained(media_stream_manager)), 2536 base::Unretained(media_stream_manager)),
2539 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 2537 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
2540 } 2538 }
2541 #endif 2539 #endif
2542 2540
2543 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2541 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2544 GetInterfaceRegistry()->AddInterface(base::Bind( 2542 GetInterfaceRegistry()->AddInterface(base::Bind(
2545 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); 2543 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID()));
2546 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 2544 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
(...skipping 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after
3664 } 3662 }
3665 3663
3666 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( 3664 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame(
3667 const std::string& interface_name, 3665 const std::string& interface_name,
3668 mojo::ScopedMessagePipeHandle pipe) { 3666 mojo::ScopedMessagePipeHandle pipe) {
3669 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); 3667 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe));
3670 } 3668 }
3671 #endif 3669 #endif
3672 3670
3673 } // namespace content 3671 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698