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

Side by Side Diff: chromecast/browser/cast_content_browser_client.cc

Issue 773313002: Expose render_process_id to CastShellActivity. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fixes. 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
« no previous file with comments | « chromecast/browser/android/cast_window_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/scoped_file.h" 8 #include "base/files/scoped_file.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 GURL requesting_url, 187 GURL requesting_url,
188 int render_process_id) { 188 int render_process_id) {
189 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 189 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
190 CastNetworkDelegate* network_delegate = 190 CastNetworkDelegate* network_delegate =
191 url_request_context_factory_->app_network_delegate(); 191 url_request_context_factory_->app_network_delegate();
192 if (network_delegate->IsWhitelisted(requesting_url, 192 if (network_delegate->IsWhitelisted(requesting_url,
193 render_process_id, false)) { 193 render_process_id, false)) {
194 return CastNetworkDelegate::DeviceCert(); 194 return CastNetworkDelegate::DeviceCert();
195 } else { 195 } else {
196 LOG(ERROR) << "Invalid host for client certificate request: " 196 LOG(ERROR) << "Invalid host for client certificate request: "
197 << requesting_url.host(); 197 << requesting_url.host()
198 << " with render_process_id: "
199 << render_process_id;
198 return NULL; 200 return NULL;
199 } 201 }
200 } 202 }
201 203
202 bool CastContentBrowserClient::CanCreateWindow( 204 bool CastContentBrowserClient::CanCreateWindow(
203 const GURL& opener_url, 205 const GURL& opener_url,
204 const GURL& opener_top_level_frame_url, 206 const GURL& opener_top_level_frame_url,
205 const GURL& source_origin, 207 const GURL& source_origin,
206 WindowContainerType container_type, 208 WindowContainerType container_type,
207 const GURL& target_url, 209 const GURL& target_url,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 content::ExternalVideoSurfaceContainer* 261 content::ExternalVideoSurfaceContainer*
260 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 262 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
261 content::WebContents* web_contents) { 263 content::WebContents* web_contents) {
262 return new ExternalVideoSurfaceContainerImpl(web_contents); 264 return new ExternalVideoSurfaceContainerImpl(web_contents);
263 } 265 }
264 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) 266 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE)
265 267
266 268
267 } // namespace shell 269 } // namespace shell
268 } // namespace chromecast 270 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/android/cast_window_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698