OLD | NEW |
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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.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/crash_logging.h" | 10 #include "base/debug/crash_logging.h" |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 #if defined(ENABLE_EXTENSIONS) | 559 #if defined(ENABLE_EXTENSIONS) |
560 if (!ChromeExtensionsRendererClient::GetInstance()->OverrideCreatePlugin( | 560 if (!ChromeExtensionsRendererClient::GetInstance()->OverrideCreatePlugin( |
561 render_frame, params)) { | 561 render_frame, params)) { |
562 return false; | 562 return false; |
563 } | 563 } |
564 #endif | 564 #endif |
565 | 565 |
566 GURL url(params.url); | 566 GURL url(params.url); |
567 #if defined(ENABLE_PLUGINS) | 567 #if defined(ENABLE_PLUGINS) |
568 ChromeViewHostMsg_GetPluginInfo_Output output; | 568 ChromeViewHostMsg_GetPluginInfo_Output output; |
569 WebString top_origin = frame->top()->securityOrigin().toString(); | 569 WebString top_origin = frame->top()->getSecurityOrigin().toString(); |
570 render_frame->Send(new ChromeViewHostMsg_GetPluginInfo( | 570 render_frame->Send(new ChromeViewHostMsg_GetPluginInfo( |
571 render_frame->GetRoutingID(), url, blink::WebStringToGURL(top_origin), | 571 render_frame->GetRoutingID(), url, blink::WebStringToGURL(top_origin), |
572 orig_mime_type, &output)); | 572 orig_mime_type, &output)); |
573 *plugin = CreatePlugin(render_frame, frame, params, output); | 573 *plugin = CreatePlugin(render_frame, frame, params, output); |
574 #else // !defined(ENABLE_PLUGINS) | 574 #else // !defined(ENABLE_PLUGINS) |
575 | 575 |
576 #if defined(OS_ANDROID) | 576 #if defined(OS_ANDROID) |
577 if (plugins::MobileYouTubePlugin::IsYouTubeURL(url, orig_mime_type)) { | 577 if (plugins::MobileYouTubePlugin::IsYouTubeURL(url, orig_mime_type)) { |
578 base::StringPiece template_html( | 578 base::StringPiece template_html( |
579 ResourceBundle::GetSharedInstance().GetRawDataResource( | 579 ResourceBundle::GetSharedInstance().GetRawDataResource( |
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1419 #if defined(ENABLE_EXTENSIONS) | 1419 #if defined(ENABLE_EXTENSIONS) |
1420 return !IsStandaloneExtensionProcess(); | 1420 return !IsStandaloneExtensionProcess(); |
1421 #else | 1421 #else |
1422 return true; | 1422 return true; |
1423 #endif | 1423 #endif |
1424 } | 1424 } |
1425 | 1425 |
1426 base::StringPiece ChromeContentRendererClient::GetOriginTrialPublicKey() { | 1426 base::StringPiece ChromeContentRendererClient::GetOriginTrialPublicKey() { |
1427 return origin_trial_key_manager_.GetPublicKey(); | 1427 return origin_trial_key_manager_.GetPublicKey(); |
1428 } | 1428 } |
OLD | NEW |