| OLD | NEW |
| 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 "base/base_paths.h" | 5 #include "base/base_paths.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/debug/crash_logging.h" | 7 #include "base/debug/crash_logging.h" |
| 8 #include "base/debug/debugger.h" | 8 #include "base/debug/debugger.h" |
| 9 #include "base/feature_list.h" | 9 #include "base/feature_list.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 #ifdef V8_USE_EXTERNAL_STARTUP_DATA | 129 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 130 gin::V8Initializer::LoadV8Snapshot(); | 130 gin::V8Initializer::LoadV8Snapshot(); |
| 131 gin::V8Initializer::LoadV8Natives(); | 131 gin::V8Initializer::LoadV8Natives(); |
| 132 #endif | 132 #endif |
| 133 | 133 |
| 134 #if defined(OS_LINUX) | 134 #if defined(OS_LINUX) |
| 135 LinuxSandbox::InitializeSandbox(); | 135 LinuxSandbox::InitializeSandbox(); |
| 136 #endif | 136 #endif |
| 137 | 137 |
| 138 scoped_ptr<base::FeatureList> feature_list(new base::FeatureList); | 138 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); |
| 139 feature_list->InitializeFromCommandLine( | 139 feature_list->InitializeFromCommandLine( |
| 140 command_line.GetSwitchValueASCII(switches::kEnableFeatures), | 140 command_line.GetSwitchValueASCII(switches::kEnableFeatures), |
| 141 command_line.GetSwitchValueASCII(switches::kDisableFeatures)); | 141 command_line.GetSwitchValueASCII(switches::kDisableFeatures)); |
| 142 base::FeatureList::SetInstance(std::move(feature_list)); | 142 base::FeatureList::SetInstance(std::move(feature_list)); |
| 143 | 143 |
| 144 ChildProcess ppapi_process; | 144 ChildProcess ppapi_process; |
| 145 ppapi_process.set_main_thread( | 145 ppapi_process.set_main_thread( |
| 146 new PpapiThread(parameters.command_line, false)); // Not a broker. | 146 new PpapiThread(parameters.command_line, false)); // Not a broker. |
| 147 | 147 |
| 148 #if defined(OS_WIN) | 148 #if defined(OS_WIN) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 161 | 161 |
| 162 main_message_loop.Run(); | 162 main_message_loop.Run(); |
| 163 | 163 |
| 164 #if defined(OS_WIN) | 164 #if defined(OS_WIN) |
| 165 UninitializeDWriteFontProxy(); | 165 UninitializeDWriteFontProxy(); |
| 166 #endif | 166 #endif |
| 167 return 0; | 167 return 0; |
| 168 } | 168 } |
| 169 | 169 |
| 170 } // namespace content | 170 } // namespace content |
| OLD | NEW |