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

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

Issue 430813004: Componentize content_settings_provider.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing file Created 6 years, 4 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" 93 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
94 #include "chrome/common/logging_chrome.h" 94 #include "chrome/common/logging_chrome.h"
95 #include "chrome/common/pepper_permission_util.h" 95 #include "chrome/common/pepper_permission_util.h"
96 #include "chrome/common/pref_names.h" 96 #include "chrome/common/pref_names.h"
97 #include "chrome/common/render_messages.h" 97 #include "chrome/common/render_messages.h"
98 #include "chrome/common/url_constants.h" 98 #include "chrome/common/url_constants.h"
99 #include "chrome/installer/util/google_update_settings.h" 99 #include "chrome/installer/util/google_update_settings.h"
100 #include "chromeos/chromeos_constants.h" 100 #include "chromeos/chromeos_constants.h"
101 #include "components/cdm/browser/cdm_message_filter_android.h" 101 #include "components/cdm/browser/cdm_message_filter_android.h"
102 #include "components/cloud_devices/common/cloud_devices_switches.h" 102 #include "components/cloud_devices/common/cloud_devices_switches.h"
103 #include "components/content_settings/core/browser/content_settings_provider.h"
103 #include "components/dom_distiller/core/url_constants.h" 104 #include "components/dom_distiller/core/url_constants.h"
104 #include "components/google/core/browser/google_util.h" 105 #include "components/google/core/browser/google_util.h"
105 #include "components/metrics/client_info.h" 106 #include "components/metrics/client_info.h"
106 #include "components/pref_registry/pref_registry_syncable.h" 107 #include "components/pref_registry/pref_registry_syncable.h"
107 #include "components/signin/core/common/profile_management_switches.h" 108 #include "components/signin/core/common/profile_management_switches.h"
108 #include "components/translate/core/common/translate_switches.h" 109 #include "components/translate/core/common/translate_switches.h"
109 #include "content/public/browser/browser_child_process_host.h" 110 #include "content/public/browser/browser_child_process_host.h"
110 #include "content/public/browser/browser_main_parts.h" 111 #include "content/public/browser/browser_main_parts.h"
111 #include "content/public/browser/browser_ppapi_host.h" 112 #include "content/public/browser/browser_ppapi_host.h"
112 #include "content/public/browser/browser_thread.h" 113 #include "content/public/browser/browser_thread.h"
(...skipping 2837 matching lines...) Expand 10 before | Expand all | Expand 10 after
2950 switches::kDisableWebRtcEncryption, 2951 switches::kDisableWebRtcEncryption,
2951 }; 2952 };
2952 to_command_line->CopySwitchesFrom(from_command_line, 2953 to_command_line->CopySwitchesFrom(from_command_line,
2953 kWebRtcDevSwitchNames, 2954 kWebRtcDevSwitchNames,
2954 arraysize(kWebRtcDevSwitchNames)); 2955 arraysize(kWebRtcDevSwitchNames));
2955 } 2956 }
2956 } 2957 }
2957 #endif // defined(ENABLE_WEBRTC) 2958 #endif // defined(ENABLE_WEBRTC)
2958 2959
2959 } // namespace chrome 2960 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698