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 "content/public/app/content_main_runner.h" | 5 #include "content/public/app/content_main_runner.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdlib.h> | 8 #include <stdlib.h> |
9 #include <string.h> | 9 #include <string.h> |
10 | 10 |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
246 if (process_type == switches::kUtilityProcess || | 246 if (process_type == switches::kUtilityProcess || |
247 base::CommandLine::ForCurrentProcess()->HasSwitch( | 247 base::CommandLine::ForCurrentProcess()->HasSwitch( |
248 switches::kSingleProcess)) { | 248 switches::kSingleProcess)) { |
249 if (delegate) | 249 if (delegate) |
250 content_client->utility_ = delegate->CreateContentUtilityClient(); | 250 content_client->utility_ = delegate->CreateContentUtilityClient(); |
251 // TODO(scottmg): http://crbug.com/237249 Should be in _child. | 251 // TODO(scottmg): http://crbug.com/237249 Should be in _child. |
252 if (!content_client->utility_) | 252 if (!content_client->utility_) |
253 content_client->utility_ = &g_empty_content_utility_client.Get(); | 253 content_client->utility_ = &g_empty_content_utility_client.Get(); |
254 } | 254 } |
255 #endif // !CHROME_MULTIPLE_DLL_BROWSER | 255 #endif // !CHROME_MULTIPLE_DLL_BROWSER |
256 content_client->InitializeOriginTrials(); | |
jam
2016/04/21 17:56:19
instead of adding a new ContentClient method, whic
iclelland
2016/04/25 15:26:18
Yes I can. Other content embedders will need to fo
| |
256 } | 257 } |
257 }; | 258 }; |
258 | 259 |
259 // We dispatch to a process-type-specific FooMain() based on a command-line | 260 // We dispatch to a process-type-specific FooMain() based on a command-line |
260 // flag. This struct is used to build a table of (flag, main function) pairs. | 261 // flag. This struct is used to build a table of (flag, main function) pairs. |
261 struct MainFunction { | 262 struct MainFunction { |
262 const char* name; | 263 const char* name; |
263 int (*function)(const MainFunctionParams&); | 264 int (*function)(const MainFunctionParams&); |
264 }; | 265 }; |
265 | 266 |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
798 | 799 |
799 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 800 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
800 }; | 801 }; |
801 | 802 |
802 // static | 803 // static |
803 ContentMainRunner* ContentMainRunner::Create() { | 804 ContentMainRunner* ContentMainRunner::Create() { |
804 return new ContentMainRunnerImpl(); | 805 return new ContentMainRunnerImpl(); |
805 } | 806 } |
806 | 807 |
807 } // namespace content | 808 } // namespace content |
OLD | NEW |