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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: last comment 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
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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 #include "chrome/common/logging_chrome.h" 85 #include "chrome/common/logging_chrome.h"
86 #include "chrome/common/pepper_permission_util.h" 86 #include "chrome/common/pepper_permission_util.h"
87 #include "chrome/common/pref_names.h" 87 #include "chrome/common/pref_names.h"
88 #include "chrome/common/render_messages.h" 88 #include "chrome/common/render_messages.h"
89 #include "chrome/common/url_constants.h" 89 #include "chrome/common/url_constants.h"
90 #include "chrome/grit/generated_resources.h" 90 #include "chrome/grit/generated_resources.h"
91 #include "chrome/installer/util/google_update_settings.h" 91 #include "chrome/installer/util/google_update_settings.h"
92 #include "chromeos/chromeos_constants.h" 92 #include "chromeos/chromeos_constants.h"
93 #include "components/cdm/browser/cdm_message_filter_android.h" 93 #include "components/cdm/browser/cdm_message_filter_android.h"
94 #include "components/cloud_devices/common/cloud_devices_switches.h" 94 #include "components/cloud_devices/common/cloud_devices_switches.h"
95 #include "components/content_settings/core/browser/content_settings_provider.h"
95 #include "components/content_settings/core/common/content_settings.h" 96 #include "components/content_settings/core/common/content_settings.h"
96 #include "components/dom_distiller/core/url_constants.h" 97 #include "components/dom_distiller/core/url_constants.h"
97 #include "components/google/core/browser/google_util.h" 98 #include "components/google/core/browser/google_util.h"
98 #include "components/metrics/client_info.h" 99 #include "components/metrics/client_info.h"
99 #include "components/pref_registry/pref_registry_syncable.h" 100 #include "components/pref_registry/pref_registry_syncable.h"
100 #include "components/signin/core/common/profile_management_switches.h" 101 #include "components/signin/core/common/profile_management_switches.h"
101 #include "components/translate/core/common/translate_switches.h" 102 #include "components/translate/core/common/translate_switches.h"
102 #include "content/public/browser/browser_child_process_host.h" 103 #include "content/public/browser/browser_child_process_host.h"
103 #include "content/public/browser/browser_main_parts.h" 104 #include "content/public/browser/browser_main_parts.h"
104 #include "content/public/browser/browser_ppapi_host.h" 105 #include "content/public/browser/browser_ppapi_host.h"
(...skipping 2486 matching lines...) Expand 10 before | Expand all | Expand 10 after
2591 switches::kDisableWebRtcEncryption, 2592 switches::kDisableWebRtcEncryption,
2592 }; 2593 };
2593 to_command_line->CopySwitchesFrom(from_command_line, 2594 to_command_line->CopySwitchesFrom(from_command_line,
2594 kWebRtcDevSwitchNames, 2595 kWebRtcDevSwitchNames,
2595 arraysize(kWebRtcDevSwitchNames)); 2596 arraysize(kWebRtcDevSwitchNames));
2596 } 2597 }
2597 } 2598 }
2598 #endif // defined(ENABLE_WEBRTC) 2599 #endif // defined(ENABLE_WEBRTC)
2599 2600
2600 } // namespace chrome 2601 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/content_settings/content_settings_default_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698