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

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

Issue 10828314: Move Variations stuff into variations/ directories and add OWNERS files for the variations client t… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add OWNERS files Created 8 years, 4 months 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/google/google_util.h" 43 #include "chrome/browser/google/google_util.h"
44 #include "chrome/browser/gpu_blacklist.h" 44 #include "chrome/browser/gpu_blacklist.h"
45 #include "chrome/browser/jankometer.h" 45 #include "chrome/browser/jankometer.h"
46 #include "chrome/browser/language_usage_metrics.h" 46 #include "chrome/browser/language_usage_metrics.h"
47 #include "chrome/browser/managed_mode.h" 47 #include "chrome/browser/managed_mode.h"
48 #include "chrome/browser/metrics/field_trial_synchronizer.h" 48 #include "chrome/browser/metrics/field_trial_synchronizer.h"
49 #include "chrome/browser/metrics/metrics_log.h" 49 #include "chrome/browser/metrics/metrics_log.h"
50 #include "chrome/browser/metrics/metrics_service.h" 50 #include "chrome/browser/metrics/metrics_service.h"
51 #include "chrome/browser/metrics/thread_watcher.h" 51 #include "chrome/browser/metrics/thread_watcher.h"
52 #include "chrome/browser/metrics/tracking_synchronizer.h" 52 #include "chrome/browser/metrics/tracking_synchronizer.h"
53 #include "chrome/browser/metrics/variations_service.h" 53 #include "chrome/browser/metrics/variations/variations_service.h"
54 #include "chrome/browser/nacl_host/nacl_process_host.h" 54 #include "chrome/browser/nacl_host/nacl_process_host.h"
55 #include "chrome/browser/net/chrome_net_log.h" 55 #include "chrome/browser/net/chrome_net_log.h"
56 #include "chrome/browser/notifications/desktop_notification_service.h" 56 #include "chrome/browser/notifications/desktop_notification_service.h"
57 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 57 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
58 #include "chrome/browser/page_cycler/page_cycler.h" 58 #include "chrome/browser/page_cycler/page_cycler.h"
59 #include "chrome/browser/performance_monitor/performance_monitor.h" 59 #include "chrome/browser/performance_monitor/performance_monitor.h"
60 #include "chrome/browser/performance_monitor/startup_timer.h" 60 #include "chrome/browser/performance_monitor/startup_timer.h"
61 #include "chrome/browser/plugin_prefs.h" 61 #include "chrome/browser/plugin_prefs.h"
62 #include "chrome/browser/prefs/pref_service.h" 62 #include "chrome/browser/prefs/pref_service.h"
63 #include "chrome/browser/prefs/pref_value_store.h" 63 #include "chrome/browser/prefs/pref_value_store.h"
(...skipping 21 matching lines...) Expand all
85 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" 85 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
86 #include "chrome/common/child_process_logging.h" 86 #include "chrome/common/child_process_logging.h"
87 #include "chrome/common/chrome_constants.h" 87 #include "chrome/common/chrome_constants.h"
88 #include "chrome/common/chrome_paths.h" 88 #include "chrome/common/chrome_paths.h"
89 #include "chrome/common/chrome_result_codes.h" 89 #include "chrome/common/chrome_result_codes.h"
90 #include "chrome/common/chrome_switches.h" 90 #include "chrome/common/chrome_switches.h"
91 #include "chrome/common/env_vars.h" 91 #include "chrome/common/env_vars.h"
92 #include "chrome/common/json_pref_store.h" 92 #include "chrome/common/json_pref_store.h"
93 #include "chrome/common/jstemplate_builder.h" 93 #include "chrome/common/jstemplate_builder.h"
94 #include "chrome/common/logging_chrome.h" 94 #include "chrome/common/logging_chrome.h"
95 #include "chrome/common/metrics/variations_util.h" 95 #include "chrome/common/metrics/variations/variations_util.h"
96 #include "chrome/common/net/net_resource_provider.h" 96 #include "chrome/common/net/net_resource_provider.h"
97 #include "chrome/common/pref_names.h" 97 #include "chrome/common/pref_names.h"
98 #include "chrome/common/profiling.h" 98 #include "chrome/common/profiling.h"
99 #include "chrome/installer/util/google_update_settings.h" 99 #include "chrome/installer/util/google_update_settings.h"
100 #include "content/public/browser/browser_thread.h" 100 #include "content/public/browser/browser_thread.h"
101 #include "content/public/browser/gpu_data_manager.h" 101 #include "content/public/browser/gpu_data_manager.h"
102 #include "content/public/browser/render_process_host.h" 102 #include "content/public/browser/render_process_host.h"
103 #include "content/public/common/content_client.h" 103 #include "content/public/common/content_client.h"
104 #include "content/public/common/main_function_params.h" 104 #include "content/public/common/main_function_params.h"
105 #include "grit/app_locale_settings.h" 105 #include "grit/app_locale_settings.h"
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after
1560 if (base::win::GetVersion() <= base::win::VERSION_XP) 1560 if (base::win::GetVersion() <= base::win::VERSION_XP)
1561 uma_name += "_XP"; 1561 uma_name += "_XP";
1562 1562
1563 uma_name += "_PreRead_"; 1563 uma_name += "_PreRead_";
1564 uma_name += pre_read_percentage; 1564 uma_name += pre_read_percentage;
1565 AddPreReadHistogramTime(uma_name.c_str(), time); 1565 AddPreReadHistogramTime(uma_name.c_str(), time);
1566 } 1566 }
1567 #endif 1567 #endif
1568 #endif 1568 #endif
1569 } 1569 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_field_trials.cc ('k') | chrome/browser/metrics/field_trial_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698