| 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 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 741 base::FilePath user_data_dir; | 741 base::FilePath user_data_dir; |
| 742 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) | 742 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) |
| 743 downgrade::UpdateLastVersion(user_data_dir); | 743 downgrade::UpdateLastVersion(user_data_dir); |
| 744 } | 744 } |
| 745 #endif | 745 #endif |
| 746 } | 746 } |
| 747 | 747 |
| 748 // Register component_updater PathProvider after DIR_USER_DATA overidden by | 748 // Register component_updater PathProvider after DIR_USER_DATA overidden by |
| 749 // command line flags. Maybe move the chrome PathProvider down here also? | 749 // command line flags. Maybe move the chrome PathProvider down here also? |
| 750 component_updater::RegisterPathProvider(chrome::DIR_COMPONENTS, | 750 component_updater::RegisterPathProvider(chrome::DIR_COMPONENTS, |
| 751 chrome::DIR_INTERNAL_PLUGINS, |
| 751 chrome::DIR_USER_DATA); | 752 chrome::DIR_USER_DATA); |
| 752 | 753 |
| 753 // Enable Message Loop related state asap. | 754 // Enable Message Loop related state asap. |
| 754 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) | 755 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) |
| 755 base::MessageLoop::EnableHistogrammer(true); | 756 base::MessageLoop::EnableHistogrammer(true); |
| 756 | 757 |
| 757 #if !defined(OS_ANDROID) && !defined(OS_WIN) | 758 #if !defined(OS_ANDROID) && !defined(OS_WIN) |
| 758 // Android does InitLogging when library is loaded. Skip here. | 759 // Android does InitLogging when library is loaded. Skip here. |
| 759 // For windows we call InitLogging when the sandbox is initialized. | 760 // For windows we call InitLogging when the sandbox is initialized. |
| 760 InitLogging(process_type); | 761 InitLogging(process_type); |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1043 case version_info::Channel::CANARY: | 1044 case version_info::Channel::CANARY: |
| 1044 return true; | 1045 return true; |
| 1045 case version_info::Channel::DEV: | 1046 case version_info::Channel::DEV: |
| 1046 case version_info::Channel::BETA: | 1047 case version_info::Channel::BETA: |
| 1047 case version_info::Channel::STABLE: | 1048 case version_info::Channel::STABLE: |
| 1048 default: | 1049 default: |
| 1049 // Don't enable instrumentation. | 1050 // Don't enable instrumentation. |
| 1050 return false; | 1051 return false; |
| 1051 } | 1052 } |
| 1052 } | 1053 } |
| OLD | NEW |