| 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 <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 | 753 |
| 754 bool is_first_run = false; | 754 bool is_first_run = false; |
| 755 #if !defined(OS_ANDROID) | 755 #if !defined(OS_ANDROID) |
| 756 // On Android, first run is handled in Java code, and the C++ side of Chrome | 756 // On Android, first run is handled in Java code, and the C++ side of Chrome |
| 757 // doesn't know if this is the first run. This will cause some inaccuracy in | 757 // doesn't know if this is the first run. This will cause some inaccuracy in |
| 758 // the UMA statistics, but this should be minor (first runs are rare). | 758 // the UMA statistics, but this should be minor (first runs are rare). |
| 759 is_first_run = first_run::IsChromeFirstRun(); | 759 is_first_run = first_run::IsChromeFirstRun(); |
| 760 #endif // defined(OS_ANDROID) | 760 #endif // defined(OS_ANDROID) |
| 761 | 761 |
| 762 // Record collected startup metrics. | 762 // Record collected startup metrics. |
| 763 startup_metric_utils::RecordBrowserMainMessageLoopStart(base::Time::Now(), | 763 startup_metric_utils::RecordBrowserMainMessageLoopStart( |
| 764 is_first_run); | 764 base::TimeTicks::Now(), is_first_run); |
| 765 } | 765 } |
| 766 | 766 |
| 767 // ----------------------------------------------------------------------------- | 767 // ----------------------------------------------------------------------------- |
| 768 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts. | 768 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts. |
| 769 | 769 |
| 770 #if defined(OS_WIN) | 770 #if defined(OS_WIN) |
| 771 #define DLLEXPORT __declspec(dllexport) | 771 #define DLLEXPORT __declspec(dllexport) |
| 772 | 772 |
| 773 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. | 773 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. |
| 774 extern "C" { | 774 extern "C" { |
| (...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1850 chromeos::CrosSettings::Shutdown(); | 1850 chromeos::CrosSettings::Shutdown(); |
| 1851 #endif // defined(OS_CHROMEOS) | 1851 #endif // defined(OS_CHROMEOS) |
| 1852 #endif // defined(OS_ANDROID) | 1852 #endif // defined(OS_ANDROID) |
| 1853 } | 1853 } |
| 1854 | 1854 |
| 1855 // Public members: | 1855 // Public members: |
| 1856 | 1856 |
| 1857 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1857 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1858 chrome_extra_parts_.push_back(parts); | 1858 chrome_extra_parts_.push_back(parts); |
| 1859 } | 1859 } |
| OLD | NEW |