Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 1431053003: Revert of Move components/startup_metric_utils/* to components/startup_metric_utils/browser/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 #include "components/google/core/browser/google_util.h" 110 #include "components/google/core/browser/google_util.h"
111 #include "components/language_usage_metrics/language_usage_metrics.h" 111 #include "components/language_usage_metrics/language_usage_metrics.h"
112 #include "components/metrics/call_stack_profile_metrics_provider.h" 112 #include "components/metrics/call_stack_profile_metrics_provider.h"
113 #include "components/metrics/metrics_service.h" 113 #include "components/metrics/metrics_service.h"
114 #include "components/metrics/profiler/content/content_tracking_synchronizer_dele gate.h" 114 #include "components/metrics/profiler/content/content_tracking_synchronizer_dele gate.h"
115 #include "components/metrics/profiler/tracking_synchronizer.h" 115 #include "components/metrics/profiler/tracking_synchronizer.h"
116 #include "components/metrics_services_manager/metrics_services_manager.h" 116 #include "components/metrics_services_manager/metrics_services_manager.h"
117 #include "components/nacl/browser/nacl_browser.h" 117 #include "components/nacl/browser/nacl_browser.h"
118 #include "components/rappor/rappor_service.h" 118 #include "components/rappor/rappor_service.h"
119 #include "components/signin/core/common/profile_management_switches.h" 119 #include "components/signin/core/common/profile_management_switches.h"
120 #include "components/startup_metric_utils/browser/startup_metric_utils.h" 120 #include "components/startup_metric_utils/startup_metric_utils.h"
121 #include "components/tracing/tracing_switches.h" 121 #include "components/tracing/tracing_switches.h"
122 #include "components/translate/content/browser/browser_cld_utils.h" 122 #include "components/translate/content/browser/browser_cld_utils.h"
123 #include "components/translate/content/common/cld_data_source.h" 123 #include "components/translate/content/common/cld_data_source.h"
124 #include "components/translate/core/browser/translate_download_manager.h" 124 #include "components/translate/core/browser/translate_download_manager.h"
125 #include "components/variations/net/variations_http_header_provider.h" 125 #include "components/variations/net/variations_http_header_provider.h"
126 #include "components/variations/pref_names.h" 126 #include "components/variations/pref_names.h"
127 #include "components/variations/service/variations_service.h" 127 #include "components/variations/service/variations_service.h"
128 #include "components/variations/variations_associated_data.h" 128 #include "components/variations/variations_associated_data.h"
129 #include "components/variations/variations_switches.h" 129 #include "components/variations/variations_switches.h"
130 #include "components/version_info/version_info.h" 130 #include "components/version_info/version_info.h"
(...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698