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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « chrome/common/render_messages.h ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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/path_service.h" 13 #include "base/path_service.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/chrome_version_info.h" 20 #include "chrome/common/chrome_version_info.h"
21 #include "chrome/common/content_settings_pattern.h"
22 #include "chrome/common/crash_keys.h" 21 #include "chrome/common/crash_keys.h"
23 #include "chrome/common/extensions/chrome_extensions_client.h" 22 #include "chrome/common/extensions/chrome_extensions_client.h"
24 #include "chrome/common/extensions/extension_constants.h" 23 #include "chrome/common/extensions/extension_constants.h"
25 #include "chrome/common/extensions/extension_process_policy.h" 24 #include "chrome/common/extensions/extension_process_policy.h"
26 #include "chrome/common/localized_error.h" 25 #include "chrome/common/localized_error.h"
27 #include "chrome/common/pepper_permission_util.h" 26 #include "chrome/common/pepper_permission_util.h"
28 #include "chrome/common/render_messages.h" 27 #include "chrome/common/render_messages.h"
29 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
30 #include "chrome/grit/generated_resources.h" 29 #include "chrome/grit/generated_resources.h"
31 #include "chrome/grit/locale_settings.h" 30 #include "chrome/grit/locale_settings.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 63 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
65 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 64 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
66 #include "chrome/renderer/searchbox/search_bouncer.h" 65 #include "chrome/renderer/searchbox/search_bouncer.h"
67 #include "chrome/renderer/searchbox/searchbox.h" 66 #include "chrome/renderer/searchbox/searchbox.h"
68 #include "chrome/renderer/searchbox/searchbox_extension.h" 67 #include "chrome/renderer/searchbox/searchbox_extension.h"
69 #include "chrome/renderer/tts_dispatcher.h" 68 #include "chrome/renderer/tts_dispatcher.h"
70 #include "chrome/renderer/worker_permission_client_proxy.h" 69 #include "chrome/renderer/worker_permission_client_proxy.h"
71 #include "components/autofill/content/renderer/autofill_agent.h" 70 #include "components/autofill/content/renderer/autofill_agent.h"
72 #include "components/autofill/content/renderer/password_autofill_agent.h" 71 #include "components/autofill/content/renderer/password_autofill_agent.h"
73 #include "components/autofill/content/renderer/password_generation_agent.h" 72 #include "components/autofill/content/renderer/password_generation_agent.h"
73 #include "components/content_settings/core/common/content_settings_pattern.h"
74 #include "components/dom_distiller/core/url_constants.h" 74 #include "components/dom_distiller/core/url_constants.h"
75 #include "components/nacl/renderer/ppb_nacl_private_impl.h" 75 #include "components/nacl/renderer/ppb_nacl_private_impl.h"
76 #include "components/password_manager/content/renderer/credential_manager_client .h" 76 #include "components/password_manager/content/renderer/credential_manager_client .h"
77 #include "components/pdf/renderer/ppb_pdf_impl.h" 77 #include "components/pdf/renderer/ppb_pdf_impl.h"
78 #include "components/plugins/renderer/mobile_youtube_plugin.h" 78 #include "components/plugins/renderer/mobile_youtube_plugin.h"
79 #include "components/signin/core/common/profile_management_switches.h" 79 #include "components/signin/core/common/profile_management_switches.h"
80 #include "components/visitedlink/renderer/visitedlink_slave.h" 80 #include "components/visitedlink/renderer/visitedlink_slave.h"
81 #include "content/public/common/content_constants.h" 81 #include "content/public/common/content_constants.h"
82 #include "content/public/renderer/render_frame.h" 82 #include "content/public/renderer/render_frame.h"
83 #include "content/public/renderer/render_thread.h" 83 #include "content/public/renderer/render_thread.h"
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 1517
1518 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_)) 1518 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
1519 return true; 1519 return true;
1520 1520
1521 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); 1521 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
1522 return channel <= chrome::VersionInfo::CHANNEL_DEV; 1522 return channel <= chrome::VersionInfo::CHANNEL_DEV;
1523 #else 1523 #else
1524 return false; 1524 return false;
1525 #endif 1525 #endif
1526 } 1526 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698