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

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

Issue 9303005: [NTP4] Experiment for adding Chrome Web Store link to footer. (Closed)
Patch Set: rebase Created 8 years, 10 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/resources/ntp4/apps_page.js » ('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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "chrome/browser/language_usage_metrics.h" 48 #include "chrome/browser/language_usage_metrics.h"
49 #include "chrome/browser/metrics/field_trial_synchronizer.h" 49 #include "chrome/browser/metrics/field_trial_synchronizer.h"
50 #include "chrome/browser/metrics/histogram_synchronizer.h" 50 #include "chrome/browser/metrics/histogram_synchronizer.h"
51 #include "chrome/browser/metrics/metrics_log.h" 51 #include "chrome/browser/metrics/metrics_log.h"
52 #include "chrome/browser/metrics/metrics_service.h" 52 #include "chrome/browser/metrics/metrics_service.h"
53 #include "chrome/browser/metrics/thread_watcher.h" 53 #include "chrome/browser/metrics/thread_watcher.h"
54 #include "chrome/browser/metrics/tracking_synchronizer.h" 54 #include "chrome/browser/metrics/tracking_synchronizer.h"
55 #include "chrome/browser/nacl_host/nacl_process_host.h" 55 #include "chrome/browser/nacl_host/nacl_process_host.h"
56 #include "chrome/browser/net/chrome_net_log.h" 56 #include "chrome/browser/net/chrome_net_log.h"
57 #include "chrome/browser/net/predictor.h" 57 #include "chrome/browser/net/predictor.h"
58 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
58 #include "chrome/browser/notifications/desktop_notification_service.h" 59 #include "chrome/browser/notifications/desktop_notification_service.h"
59 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
60 #include "chrome/browser/plugin_prefs.h" 60 #include "chrome/browser/plugin_prefs.h"
61 #include "chrome/browser/prefs/pref_service.h" 61 #include "chrome/browser/prefs/pref_service.h"
62 #include "chrome/browser/prefs/pref_value_store.h" 62 #include "chrome/browser/prefs/pref_value_store.h"
63 #include "chrome/browser/prefs/scoped_user_pref_update.h" 63 #include "chrome/browser/prefs/scoped_user_pref_update.h"
64 #include "chrome/browser/prerender/prerender_field_trial.h" 64 #include "chrome/browser/prerender/prerender_field_trial.h"
65 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
65 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
66 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
67 #include "chrome/browser/process_singleton.h" 67 #include "chrome/browser/process_singleton.h"
68 #include "chrome/browser/profiles/profile.h" 68 #include "chrome/browser/profiles/profile.h"
69 #include "chrome/browser/profiles/profile_manager.h" 69 #include "chrome/browser/profiles/profile_manager.h"
70 #include "chrome/browser/search_engines/search_engine_type.h" 70 #include "chrome/browser/search_engines/search_engine_type.h"
71 #include "chrome/browser/search_engines/template_url.h" 71 #include "chrome/browser/search_engines/template_url.h"
72 #include "chrome/browser/search_engines/template_url_service_factory.h"
72 #include "chrome/browser/search_engines/template_url_service.h" 73 #include "chrome/browser/search_engines/template_url_service.h"
73 #include "chrome/browser/search_engines/template_url_service_factory.h"
74 #include "chrome/browser/service/service_process_control.h" 74 #include "chrome/browser/service/service_process_control.h"
75 #include "chrome/browser/shell_integration.h" 75 #include "chrome/browser/shell_integration.h"
76 #include "chrome/browser/translate/translate_manager.h" 76 #include "chrome/browser/translate/translate_manager.h"
77 #include "chrome/browser/ui/browser.h" 77 #include "chrome/browser/ui/browser.h"
78 #include "chrome/browser/ui/browser_init.h" 78 #include "chrome/browser/ui/browser_init.h"
79 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" 79 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
80 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
80 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h" 81 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
81 #include "chrome/common/child_process_logging.h" 82 #include "chrome/common/child_process_logging.h"
82 #include "chrome/common/chrome_constants.h" 83 #include "chrome/common/chrome_constants.h"
83 #include "chrome/common/chrome_paths.h" 84 #include "chrome/common/chrome_paths.h"
84 #include "chrome/common/chrome_result_codes.h" 85 #include "chrome/common/chrome_result_codes.h"
85 #include "chrome/common/chrome_switches.h" 86 #include "chrome/common/chrome_switches.h"
86 #include "chrome/common/chrome_version_info.h" 87 #include "chrome/common/chrome_version_info.h"
87 #include "chrome/common/env_vars.h" 88 #include "chrome/common/env_vars.h"
88 #include "chrome/common/json_pref_store.h" 89 #include "chrome/common/json_pref_store.h"
89 #include "chrome/common/jstemplate_builder.h" 90 #include "chrome/common/jstemplate_builder.h"
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 ProxyConnectionsFieldTrial(); 1023 ProxyConnectionsFieldTrial();
1023 prerender::ConfigurePrefetchAndPrerender(parsed_command_line()); 1024 prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
1024 InstantFieldTrial::Activate(); 1025 InstantFieldTrial::Activate();
1025 SpdyFieldTrial(); 1026 SpdyFieldTrial();
1026 ConnectBackupJobsFieldTrial(); 1027 ConnectBackupJobsFieldTrial();
1027 WarmConnectionFieldTrial(); 1028 WarmConnectionFieldTrial();
1028 PredictorFieldTrial(); 1029 PredictorFieldTrial();
1029 DefaultAppsFieldTrial(); 1030 DefaultAppsFieldTrial();
1030 AutoLaunchChromeFieldTrial(); 1031 AutoLaunchChromeFieldTrial();
1031 sync_promo_trial::Activate(); 1032 sync_promo_trial::Activate();
1033 NewTabUI::SetupFieldTrials();
1032 } 1034 }
1033 1035
1034 void ChromeBrowserMainParts::StartMetricsRecording() { 1036 void ChromeBrowserMainParts::StartMetricsRecording() {
1035 MetricsService* metrics = g_browser_process->metrics_service(); 1037 MetricsService* metrics = g_browser_process->metrics_service();
1036 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) || 1038 if (parsed_command_line_.HasSwitch(switches::kMetricsRecordingOnly) ||
1037 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) { 1039 parsed_command_line_.HasSwitch(switches::kEnableBenchmarking)) {
1038 // If we're testing then we don't care what the user preference is, we turn 1040 // If we're testing then we don't care what the user preference is, we turn
1039 // on recording, but not reporting, otherwise tests fail. 1041 // on recording, but not reporting, otherwise tests fail.
1040 metrics->StartRecordingOnly(); 1042 metrics->StartRecordingOnly();
1041 return; 1043 return;
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 if (base::win::GetVersion() <= base::win::VERSION_XP) 1935 if (base::win::GetVersion() <= base::win::VERSION_XP)
1934 uma_name += "_XP"; 1936 uma_name += "_XP";
1935 1937
1936 uma_name += "_PreRead"; 1938 uma_name += "_PreRead";
1937 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 1939 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
1938 AddPreReadHistogramTime(uma_name.c_str(), time); 1940 AddPreReadHistogramTime(uma_name.c_str(), time);
1939 } 1941 }
1940 #endif 1942 #endif
1941 #endif 1943 #endif
1942 } 1944 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/resources/ntp4/apps_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698