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

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

Issue 1755363003: Revert of Mustash: Move GURL ParamTraits to url/ipc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « android_webview/android_webview.gyp ('k') | chrome/chrome_common.gypi » ('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>
11 11
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/files/scoped_file.h" 16 #include "base/files/scoped_file.h"
17 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/string_split.h"
22 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
23 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
24 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
25 #include "base/thread_task_runner_handle.h" 24 #include "base/thread_task_runner_handle.h"
26 #include "base/threading/sequenced_worker_pool.h" 25 #include "base/threading/sequenced_worker_pool.h"
27 #include "build/build_config.h" 26 #include "build/build_config.h"
28 #include "chrome/browser/after_startup_task_utils.h" 27 #include "chrome/browser/after_startup_task_utils.h"
29 #include "chrome/browser/apps/app_url_redirector.h" 28 #include "chrome/browser/apps/app_url_redirector.h"
30 #include "chrome/browser/browser_about_handler.h" 29 #include "chrome/browser/browser_about_handler.h"
31 #include "chrome/browser/browser_process.h" 30 #include "chrome/browser/browser_process.h"
(...skipping 2911 matching lines...) Expand 10 before | Expand all | Expand 10 after
2943 if (channel <= kMaxDisableEncryptionChannel) { 2942 if (channel <= kMaxDisableEncryptionChannel) {
2944 static const char* const kWebRtcDevSwitchNames[] = { 2943 static const char* const kWebRtcDevSwitchNames[] = {
2945 switches::kDisableWebRtcEncryption, 2944 switches::kDisableWebRtcEncryption,
2946 }; 2945 };
2947 to_command_line->CopySwitchesFrom(from_command_line, 2946 to_command_line->CopySwitchesFrom(from_command_line,
2948 kWebRtcDevSwitchNames, 2947 kWebRtcDevSwitchNames,
2949 arraysize(kWebRtcDevSwitchNames)); 2948 arraysize(kWebRtcDevSwitchNames));
2950 } 2949 }
2951 } 2950 }
2952 #endif // defined(ENABLE_WEBRTC) 2951 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « android_webview/android_webview.gyp ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698