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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/metrics/user_metrics_action.h" | 12 #include "base/metrics/user_metrics_action.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/chrome_version_info.h" | 19 #include "chrome/common/chrome_version_info.h" |
20 #include "chrome/common/crash_keys.h" | 20 #include "chrome/common/crash_keys.h" |
21 #include "chrome/common/extensions/extension_metrics.h" | 21 #include "chrome/common/extensions/extension_metrics.h" |
22 #include "chrome/common/localized_error.h" | 22 #include "chrome/common/localized_error.h" |
23 #include "chrome/common/pepper_permission_util.h" | 23 #include "chrome/common/pepper_permission_util.h" |
24 #include "chrome/common/render_messages.h" | 24 #include "chrome/common/render_messages.h" |
| 25 #include "chrome/common/secure_origin_whitelist.h" |
25 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
26 #include "chrome/grit/generated_resources.h" | 27 #include "chrome/grit/generated_resources.h" |
27 #include "chrome/grit/locale_settings.h" | 28 #include "chrome/grit/locale_settings.h" |
28 #include "chrome/grit/renderer_resources.h" | 29 #include "chrome/grit/renderer_resources.h" |
29 #include "chrome/renderer/benchmarking_extension.h" | 30 #include "chrome/renderer/benchmarking_extension.h" |
30 #include "chrome/renderer/chrome_render_frame_observer.h" | 31 #include "chrome/renderer/chrome_render_frame_observer.h" |
31 #include "chrome/renderer/chrome_render_process_observer.h" | 32 #include "chrome/renderer/chrome_render_process_observer.h" |
32 #include "chrome/renderer/chrome_render_view_observer.h" | 33 #include "chrome/renderer/chrome_render_view_observer.h" |
33 #include "chrome/renderer/content_settings_observer.h" | 34 #include "chrome/renderer/content_settings_observer.h" |
34 #include "chrome/renderer/external_extension.h" | 35 #include "chrome/renderer/external_extension.h" |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 // Report if the renderer process has been patched by chrome_elf. | 502 // Report if the renderer process has been patched by chrome_elf. |
502 // TODO(csharp): Remove once the renderer is no longer getting | 503 // TODO(csharp): Remove once the renderer is no longer getting |
503 // patched this way. | 504 // patched this way. |
504 if (blacklist::IsBlacklistInitialized()) | 505 if (blacklist::IsBlacklistInitialized()) |
505 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); | 506 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); |
506 #endif | 507 #endif |
507 #if defined(ENABLE_PRINT_PREVIEW) | 508 #if defined(ENABLE_PRINT_PREVIEW) |
508 pdf_print_client_.reset(new ChromePDFPrintClient()); | 509 pdf_print_client_.reset(new ChromePDFPrintClient()); |
509 pdf::PPB_PDF_Impl::SetPrintClient(pdf_print_client_.get()); | 510 pdf::PPB_PDF_Impl::SetPrintClient(pdf_print_client_.get()); |
510 #endif | 511 #endif |
| 512 |
| 513 std::set<GURL> origins; |
| 514 GetSecureOriginWhitelist(&origins); |
| 515 for (const GURL& origin : origins) { |
| 516 WebSecurityPolicy::addOriginTrustworthyWhiteList( |
| 517 WebSecurityOrigin::create(origin)); |
| 518 } |
511 } | 519 } |
512 | 520 |
513 void ChromeContentRendererClient::RenderFrameCreated( | 521 void ChromeContentRendererClient::RenderFrameCreated( |
514 content::RenderFrame* render_frame) { | 522 content::RenderFrame* render_frame) { |
515 new ChromeRenderFrameObserver(render_frame); | 523 new ChromeRenderFrameObserver(render_frame); |
516 | 524 |
517 bool should_whitelist_for_content_settings = | 525 bool should_whitelist_for_content_settings = |
518 base::CommandLine::ForCurrentProcess()->HasSwitch( | 526 base::CommandLine::ForCurrentProcess()->HasSwitch( |
519 switches::kInstantProcess); | 527 switches::kInstantProcess); |
520 extensions::Dispatcher* ext_dispatcher = NULL; | 528 extensions::Dispatcher* ext_dispatcher = NULL; |
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1636 | 1644 |
1637 void ChromeContentRendererClient::RecordRappor(const std::string& metric, | 1645 void ChromeContentRendererClient::RecordRappor(const std::string& metric, |
1638 const std::string& sample) { | 1646 const std::string& sample) { |
1639 RenderThread::Get()->Send(new ChromeViewHostMsg_RecordRappor(metric, sample)); | 1647 RenderThread::Get()->Send(new ChromeViewHostMsg_RecordRappor(metric, sample)); |
1640 } | 1648 } |
1641 | 1649 |
1642 void ChromeContentRendererClient::RecordRapporURL(const std::string& metric, | 1650 void ChromeContentRendererClient::RecordRapporURL(const std::string& metric, |
1643 const GURL& url) { | 1651 const GURL& url) { |
1644 RenderThread::Get()->Send(new ChromeViewHostMsg_RecordRapporURL(metric, url)); | 1652 RenderThread::Get()->Send(new ChromeViewHostMsg_RecordRapporURL(metric, url)); |
1645 } | 1653 } |
OLD | NEW |