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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin_channel_manager.cc

Issue 10450002: Transfer user agent override info between browser and renderer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Diff shows what we do downstream Created 8 years, 7 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 (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/renderer/browser_plugin/browser_plugin_channel_manager.h" 5 #include "content/renderer/browser_plugin/browser_plugin_channel_manager.h"
6 6
7 #include "base/process_util.h" 7 #include "base/process_util.h"
8 #include "content/common/browser_plugin_messages.h" 8 #include "content/common/browser_plugin_messages.h"
9 #include "content/common/view_messages.h" 9 #include "content/common/view_messages.h"
10 #include "content/renderer/browser_plugin/browser_plugin.h" 10 #include "content/renderer/browser_plugin/browser_plugin.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 RenderViewImpl::Create( 51 RenderViewImpl::Create(
52 params.parent_window, 52 params.parent_window,
53 params.opener_route_id, 53 params.opener_route_id,
54 params.renderer_preferences, 54 params.renderer_preferences,
55 params.web_preferences, 55 params.web_preferences,
56 new SharedRenderViewCounter(0), 56 new SharedRenderViewCounter(0),
57 params.view_id, 57 params.view_id,
58 params.surface_id, 58 params.surface_id,
59 params.session_storage_namespace_id, 59 params.session_storage_namespace_id,
60 params.frame_name, 60 params.frame_name,
61 params.user_agent_override,
61 false, 62 false,
62 params.swapped_out, 63 params.swapped_out,
63 params.next_page_id, 64 params.next_page_id,
64 params.screen_info, 65 params.screen_info,
65 channel, 66 channel,
66 params.accessibility_mode)->AsWeakPtr(); 67 params.accessibility_mode)->AsWeakPtr();
67 RenderThreadImpl::current()->Send( 68 RenderThreadImpl::current()->Send(
68 new BrowserPluginHostMsg_ConnectToChannel(params.view_id, 69 new BrowserPluginHostMsg_ConnectToChannel(params.view_id,
69 success ? plugin_handle : IPC::ChannelHandle())); 70 success ? plugin_handle : IPC::ChannelHandle()));
70 } 71 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 114
114 void BrowserPluginChannelManager::OnLoadGuest( 115 void BrowserPluginChannelManager::OnLoadGuest(
115 int instance_id, 116 int instance_id,
116 int guest_process_id, 117 int guest_process_id,
117 const IPC::ChannelHandle& channel_handle) { 118 const IPC::ChannelHandle& channel_handle) {
118 BrowserPlugin* browser_plugin = BrowserPlugin::FromID(instance_id); 119 BrowserPlugin* browser_plugin = BrowserPlugin::FromID(instance_id);
119 browser_plugin->LoadGuest(guest_process_id, channel_handle); 120 browser_plugin->LoadGuest(guest_process_id, channel_handle);
120 } 121 }
121 122
122 } // namespace content 123 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698