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

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

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 years, 8 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/browser/DEPS ('k') | chrome/browser/chromeos/BUILD.gn » ('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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "content/public/common/content_descriptors.h" 153 #include "content/public/common/content_descriptors.h"
154 #include "content/public/common/content_features.h" 154 #include "content/public/common/content_features.h"
155 #include "content/public/common/content_switches.h" 155 #include "content/public/common/content_switches.h"
156 #include "content/public/common/sandbox_type.h" 156 #include "content/public/common/sandbox_type.h"
157 #include "content/public/common/service_registry.h" 157 #include "content/public/common/service_registry.h"
158 #include "content/public/common/url_utils.h" 158 #include "content/public/common/url_utils.h"
159 #include "content/public/common/web_preferences.h" 159 #include "content/public/common/web_preferences.h"
160 #include "device/usb/public/interfaces/chooser_service.mojom.h" 160 #include "device/usb/public/interfaces/chooser_service.mojom.h"
161 #include "device/usb/public/interfaces/device_manager.mojom.h" 161 #include "device/usb/public/interfaces/device_manager.mojom.h"
162 #include "gin/v8_initializer.h" 162 #include "gin/v8_initializer.h"
163 #include "mojo/shell/public/cpp/shell_client.h"
164 #include "net/base/mime_util.h" 163 #include "net/base/mime_util.h"
165 #include "net/cookies/canonical_cookie.h" 164 #include "net/cookies/canonical_cookie.h"
166 #include "net/cookies/cookie_options.h" 165 #include "net/cookies/cookie_options.h"
167 #include "net/ssl/ssl_cert_request_info.h" 166 #include "net/ssl/ssl_cert_request_info.h"
168 #include "ppapi/host/ppapi_host.h" 167 #include "ppapi/host/ppapi_host.h"
168 #include "services/shell/public/cpp/shell_client.h"
169 #include "storage/browser/fileapi/external_mount_points.h" 169 #include "storage/browser/fileapi/external_mount_points.h"
170 #include "ui/base/l10n/l10n_util.h" 170 #include "ui/base/l10n/l10n_util.h"
171 #include "ui/base/resource/resource_bundle.h" 171 #include "ui/base/resource/resource_bundle.h"
172 #include "ui/resources/grit/ui_resources.h" 172 #include "ui/resources/grit/ui_resources.h"
173 #include "url/gurl.h" 173 #include "url/gurl.h"
174 #include "url/origin.h" 174 #include "url/origin.h"
175 175
176 #if defined(OS_WIN) 176 #if defined(OS_WIN)
177 #include "base/strings/string_tokenizer.h" 177 #include "base/strings/string_tokenizer.h"
178 #include "base/win/windows_version.h" 178 #include "base/win/windows_version.h"
(...skipping 2765 matching lines...) Expand 10 before | Expand all | Expand 10 after
2944 if (channel <= kMaxDisableEncryptionChannel) { 2944 if (channel <= kMaxDisableEncryptionChannel) {
2945 static const char* const kWebRtcDevSwitchNames[] = { 2945 static const char* const kWebRtcDevSwitchNames[] = {
2946 switches::kDisableWebRtcEncryption, 2946 switches::kDisableWebRtcEncryption,
2947 }; 2947 };
2948 to_command_line->CopySwitchesFrom(from_command_line, 2948 to_command_line->CopySwitchesFrom(from_command_line,
2949 kWebRtcDevSwitchNames, 2949 kWebRtcDevSwitchNames,
2950 arraysize(kWebRtcDevSwitchNames)); 2950 arraysize(kWebRtcDevSwitchNames));
2951 } 2951 }
2952 } 2952 }
2953 #endif // defined(ENABLE_WEBRTC) 2953 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698