Chromium Code Reviews| 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 "chrome/app/chrome_main_delegate.h" | 5 #include "chrome/app/chrome_main_delegate.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 717 // cpu_brand info. | 717 // cpu_brand info. |
| 718 base::CPU cpu_info; | 718 base::CPU cpu_info; |
| 719 #endif | 719 #endif |
| 720 | 720 |
| 721 // Initialize the user data dir for any process type that needs it. | 721 // Initialize the user data dir for any process type that needs it. |
| 722 if (chrome::ProcessNeedsProfileDir(process_type)) | 722 if (chrome::ProcessNeedsProfileDir(process_type)) |
| 723 InitializeUserDataDir(); | 723 InitializeUserDataDir(); |
| 724 | 724 |
| 725 // Register component_updater PathProvider after DIR_USER_DATA overidden by | 725 // Register component_updater PathProvider after DIR_USER_DATA overidden by |
| 726 // command line flags. Maybe move the chrome PathProvider down here also? | 726 // command line flags. Maybe move the chrome PathProvider down here also? |
| 727 component_updater::RegisterPathProvider(chrome::DIR_USER_DATA); | 727 component_updater::RegisterPathProvider(chrome::DIR_INTERNAL_PLUGINS, |
|
xhwang
2016/05/02 17:46:59
Components are part of chrome and not necessarily
waffles
2016/05/03 21:04:22
This is an interesting discussion, due to how Flas
| |
| 728 chrome::DIR_USER_DATA); | |
| 728 | 729 |
| 729 // Enable Message Loop related state asap. | 730 // Enable Message Loop related state asap. |
| 730 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) | 731 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) |
| 731 base::MessageLoop::EnableHistogrammer(true); | 732 base::MessageLoop::EnableHistogrammer(true); |
| 732 | 733 |
| 733 #if !defined(OS_ANDROID) && !defined(OS_WIN) | 734 #if !defined(OS_ANDROID) && !defined(OS_WIN) |
| 734 // Android does InitLogging when library is loaded. Skip here. | 735 // Android does InitLogging when library is loaded. Skip here. |
| 735 // For windows we call InitLogging when the sandbox is initialized. | 736 // For windows we call InitLogging when the sandbox is initialized. |
| 736 InitLogging(process_type); | 737 InitLogging(process_type); |
| 737 #endif | 738 #endif |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1019 case version_info::Channel::CANARY: | 1020 case version_info::Channel::CANARY: |
| 1020 return true; | 1021 return true; |
| 1021 case version_info::Channel::DEV: | 1022 case version_info::Channel::DEV: |
| 1022 case version_info::Channel::BETA: | 1023 case version_info::Channel::BETA: |
| 1023 case version_info::Channel::STABLE: | 1024 case version_info::Channel::STABLE: |
| 1024 default: | 1025 default: |
| 1025 // Don't enable instrumentation. | 1026 // Don't enable instrumentation. |
| 1026 return false; | 1027 return false; |
| 1027 } | 1028 } |
| 1028 } | 1029 } |
| OLD | NEW |