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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 | 758 |
759 bool is_first_run = false; | 759 bool is_first_run = false; |
760 #if !defined(OS_ANDROID) | 760 #if !defined(OS_ANDROID) |
761 // On Android, first run is handled in Java code, and the C++ side of Chrome | 761 // On Android, first run is handled in Java code, and the C++ side of Chrome |
762 // doesn't know if this is the first run. This will cause some inaccuracy in | 762 // doesn't know if this is the first run. This will cause some inaccuracy in |
763 // the UMA statistics, but this should be minor (first runs are rare). | 763 // the UMA statistics, but this should be minor (first runs are rare). |
764 is_first_run = first_run::IsChromeFirstRun(); | 764 is_first_run = first_run::IsChromeFirstRun(); |
765 #endif // defined(OS_ANDROID) | 765 #endif // defined(OS_ANDROID) |
766 | 766 |
767 // Record collected startup metrics. | 767 // Record collected startup metrics. |
768 startup_metric_utils::RecordBrowserMainMessageLoopStart(base::Time::Now(), | 768 startup_metric_utils::RecordBrowserMainMessageLoopStart( |
769 is_first_run); | 769 base::TimeTicks::Now(), is_first_run); |
770 } | 770 } |
771 | 771 |
772 // ----------------------------------------------------------------------------- | 772 // ----------------------------------------------------------------------------- |
773 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts. | 773 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts. |
774 | 774 |
775 #if defined(OS_WIN) | 775 #if defined(OS_WIN) |
776 #define DLLEXPORT __declspec(dllexport) | 776 #define DLLEXPORT __declspec(dllexport) |
777 | 777 |
778 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. | 778 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. |
779 extern "C" { | 779 extern "C" { |
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1862 chromeos::CrosSettings::Shutdown(); | 1862 chromeos::CrosSettings::Shutdown(); |
1863 #endif // defined(OS_CHROMEOS) | 1863 #endif // defined(OS_CHROMEOS) |
1864 #endif // defined(OS_ANDROID) | 1864 #endif // defined(OS_ANDROID) |
1865 } | 1865 } |
1866 | 1866 |
1867 // Public members: | 1867 // Public members: |
1868 | 1868 |
1869 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1869 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1870 chrome_extra_parts_.push_back(parts); | 1870 chrome_extra_parts_.push_back(parts); |
1871 } | 1871 } |
OLD | NEW |