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

Side by Side Diff: chrome/common/service_process_util.cc

Issue 1892123003: Add components/network_session_configurator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on https://crrev.com/1945513002. Created 4 years, 6 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/chrome_switches.cc ('k') | chrome/service/DEPS » ('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/common/service_process_util.h" 5 #include "chrome/common/service_process_util.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/sha1.h" 18 #include "base/sha1.h"
19 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
20 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
22 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
23 #include "base/version.h" 23 #include "base/version.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/chrome_paths.h" 26 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "components/cloud_devices/common/cloud_devices_switches.h" 28 #include "components/cloud_devices/common/cloud_devices_switches.h"
29 #include "components/network_session_configurator/switches.h"
29 #include "components/version_info/version_info.h" 30 #include "components/version_info/version_info.h"
30 #include "content/public/common/content_paths.h" 31 #include "content/public/common/content_paths.h"
31 #include "content/public/common/content_switches.h" 32 #include "content/public/common/content_switches.h"
32 #include "google_apis/gaia/gaia_switches.h" 33 #include "google_apis/gaia/gaia_switches.h"
33 #include "ui/base/ui_base_switches.h" 34 #include "ui/base/ui_base_switches.h"
34 35
35 #if defined(OS_WIN) 36 #if defined(OS_WIN)
36 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win. h" 37 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win. h"
37 #endif // defined(OS_WIN) 38 #endif // defined(OS_WIN)
38 39
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 shared_data->service_process_pid = base::GetCurrentProcId(); 283 shared_data->service_process_pid = base::GetCurrentProcId();
283 shared_mem_service_data_.reset(shared_mem_service_data.release()); 284 shared_mem_service_data_.reset(shared_mem_service_data.release());
284 return true; 285 return true;
285 } 286 }
286 287
287 IPC::ChannelHandle ServiceProcessState::GetServiceProcessChannel() { 288 IPC::ChannelHandle ServiceProcessState::GetServiceProcessChannel() {
288 return ::GetServiceProcessChannel(); 289 return ::GetServiceProcessChannel();
289 } 290 }
290 291
291 #endif // !OS_MACOSX 292 #endif // !OS_MACOSX
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/service/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698