| 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/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1727 // We check this here because if the profile is OTR (chromeos possibility) | 1727 // We check this here because if the profile is OTR (chromeos possibility) |
| 1728 // it won't still be accessible after browser is destroyed. | 1728 // it won't still be accessible after browser is destroyed. |
| 1729 record_search_engine_ = is_first_run_ && !profile_->IsOffTheRecord(); | 1729 record_search_engine_ = is_first_run_ && !profile_->IsOffTheRecord(); |
| 1730 #endif | 1730 #endif |
| 1731 | 1731 |
| 1732 // Create the instance of the cloud print proxy service so that it can launch | 1732 // Create the instance of the cloud print proxy service so that it can launch |
| 1733 // the service process if needed. This is needed because the service process | 1733 // the service process if needed. This is needed because the service process |
| 1734 // might have shutdown because an update was available. | 1734 // might have shutdown because an update was available. |
| 1735 // TODO(torne): this should maybe be done with | 1735 // TODO(torne): this should maybe be done with |
| 1736 // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? | 1736 // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? |
| 1737 #if !defined(OS_ANDROID) |
| 1737 CloudPrintProxyServiceFactory::GetForProfile(profile_); | 1738 CloudPrintProxyServiceFactory::GetForProfile(profile_); |
| 1739 #endif |
| 1738 | 1740 |
| 1739 // Load GPU Blacklist. | 1741 // Load GPU Blacklist. |
| 1740 InitializeGpuDataManager(parsed_command_line()); | 1742 InitializeGpuDataManager(parsed_command_line()); |
| 1741 | 1743 |
| 1742 // Start watching all browser threads for responsiveness. | 1744 // Start watching all browser threads for responsiveness. |
| 1743 ThreadWatcherList::StartWatchingAll(parsed_command_line()); | 1745 ThreadWatcherList::StartWatchingAll(parsed_command_line()); |
| 1744 | 1746 |
| 1745 #if !defined(DISABLE_NACL) | 1747 #if !defined(DISABLE_NACL) |
| 1746 NaClProcessHost::EarlyStartup(); | 1748 NaClProcessHost::EarlyStartup(); |
| 1747 #endif | 1749 #endif |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1967 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1966 uma_name += "_XP"; | 1968 uma_name += "_XP"; |
| 1967 | 1969 |
| 1968 uma_name += "_PreRead_"; | 1970 uma_name += "_PreRead_"; |
| 1969 uma_name += pre_read_percentage; | 1971 uma_name += pre_read_percentage; |
| 1970 AddPreReadHistogramTime(uma_name.c_str(), time); | 1972 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1971 } | 1973 } |
| 1972 #endif | 1974 #endif |
| 1973 #endif | 1975 #endif |
| 1974 } | 1976 } |
| OLD | NEW |