| 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 } | 757 } |
| 758 #endif | 758 #endif |
| 759 } | 759 } |
| 760 | 760 |
| 761 // Register component_updater PathProvider after DIR_USER_DATA overidden by | 761 // Register component_updater PathProvider after DIR_USER_DATA overidden by |
| 762 // command line flags. Maybe move the chrome PathProvider down here also? | 762 // command line flags. Maybe move the chrome PathProvider down here also? |
| 763 component_updater::RegisterPathProvider(chrome::DIR_COMPONENTS, | 763 component_updater::RegisterPathProvider(chrome::DIR_COMPONENTS, |
| 764 chrome::DIR_INTERNAL_PLUGINS, | 764 chrome::DIR_INTERNAL_PLUGINS, |
| 765 chrome::DIR_USER_DATA); | 765 chrome::DIR_USER_DATA); |
| 766 | 766 |
| 767 // Enable Message Loop related state asap. | |
| 768 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) | |
| 769 base::MessageLoop::EnableHistogrammer(true); | |
| 770 | |
| 771 #if !defined(OS_ANDROID) && !defined(OS_WIN) | 767 #if !defined(OS_ANDROID) && !defined(OS_WIN) |
| 772 // Android does InitLogging when library is loaded. Skip here. | 768 // Android does InitLogging when library is loaded. Skip here. |
| 773 // For windows we call InitLogging when the sandbox is initialized. | 769 // For windows we call InitLogging when the sandbox is initialized. |
| 774 InitLogging(process_type); | 770 InitLogging(process_type); |
| 775 #endif | 771 #endif |
| 776 | 772 |
| 777 #if defined(OS_WIN) | 773 #if defined(OS_WIN) |
| 778 // TODO(zturner): Throbber icons are still stored in chrome.dll, this can be | 774 // TODO(zturner): Throbber icons are still stored in chrome.dll, this can be |
| 779 // killed once those are merged into resources.pak. See | 775 // killed once those are merged into resources.pak. See |
| 780 // GlassBrowserFrameView::InitThrobberIcons() and http://crbug.com/368327. | 776 // GlassBrowserFrameView::InitThrobberIcons() and http://crbug.com/368327. |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1057 case version_info::Channel::CANARY: | 1053 case version_info::Channel::CANARY: |
| 1058 return true; | 1054 return true; |
| 1059 case version_info::Channel::DEV: | 1055 case version_info::Channel::DEV: |
| 1060 case version_info::Channel::BETA: | 1056 case version_info::Channel::BETA: |
| 1061 case version_info::Channel::STABLE: | 1057 case version_info::Channel::STABLE: |
| 1062 default: | 1058 default: |
| 1063 // Don't enable instrumentation. | 1059 // Don't enable instrumentation. |
| 1064 return false; | 1060 return false; |
| 1065 } | 1061 } |
| 1066 } | 1062 } |
| OLD | NEW |