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

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

Issue 11361051: Remove dependency on language detection library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser.gypi » ('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 28 matching lines...) Expand all
39 #include "chrome/browser/chrome_browser_main_extra_parts.h" 39 #include "chrome/browser/chrome_browser_main_extra_parts.h"
40 #include "chrome/browser/chrome_gpu_util.h" 40 #include "chrome/browser/chrome_gpu_util.h"
41 #include "chrome/browser/defaults.h" 41 #include "chrome/browser/defaults.h"
42 #include "chrome/browser/extensions/extension_protocols.h" 42 #include "chrome/browser/extensions/extension_protocols.h"
43 #include "chrome/browser/extensions/extension_service.h" 43 #include "chrome/browser/extensions/extension_service.h"
44 #include "chrome/browser/extensions/startup_helper.h" 44 #include "chrome/browser/extensions/startup_helper.h"
45 #include "chrome/browser/first_run/upgrade_util.h" 45 #include "chrome/browser/first_run/upgrade_util.h"
46 #include "chrome/browser/google/google_search_counter.h" 46 #include "chrome/browser/google/google_search_counter.h"
47 #include "chrome/browser/google/google_util.h" 47 #include "chrome/browser/google/google_util.h"
48 #include "chrome/browser/jankometer.h" 48 #include "chrome/browser/jankometer.h"
49 #include "chrome/browser/language_usage_metrics.h"
50 #include "chrome/browser/managed_mode/managed_mode.h" 49 #include "chrome/browser/managed_mode/managed_mode.h"
51 #include "chrome/browser/metrics/field_trial_synchronizer.h" 50 #include "chrome/browser/metrics/field_trial_synchronizer.h"
52 #include "chrome/browser/metrics/metrics_log.h" 51 #include "chrome/browser/metrics/metrics_log.h"
53 #include "chrome/browser/metrics/metrics_service.h" 52 #include "chrome/browser/metrics/metrics_service.h"
54 #include "chrome/browser/metrics/thread_watcher.h" 53 #include "chrome/browser/metrics/thread_watcher.h"
55 #include "chrome/browser/metrics/tracking_synchronizer.h" 54 #include "chrome/browser/metrics/tracking_synchronizer.h"
56 #include "chrome/browser/metrics/variations/variations_service.h" 55 #include "chrome/browser/metrics/variations/variations_service.h"
57 #include "chrome/browser/nacl_host/nacl_process_host.h" 56 #include "chrome/browser/nacl_host/nacl_process_host.h"
58 #include "chrome/browser/net/chrome_net_log.h" 57 #include "chrome/browser/net/chrome_net_log.h"
59 #include "chrome/browser/notifications/desktop_notification_service.h" 58 #include "chrome/browser/notifications/desktop_notification_service.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #include <Security/Security.h> 162 #include <Security/Security.h>
164 163
165 #include "base/mac/scoped_nsautorelease_pool.h" 164 #include "base/mac/scoped_nsautorelease_pool.h"
166 #include "chrome/browser/mac/keystone_glue.h" 165 #include "chrome/browser/mac/keystone_glue.h"
167 #endif 166 #endif
168 167
169 #if defined(ENABLE_CONFIGURATION_POLICY) 168 #if defined(ENABLE_CONFIGURATION_POLICY)
170 #include "policy/policy_constants.h" 169 #include "policy/policy_constants.h"
171 #endif 170 #endif
172 171
172 #if defined(ENABLE_LANGUAGE_DETECTION)
173 #include "chrome/browser/language_usage_metrics.h"
174 #endif
175
173 #if defined(ENABLE_RLZ) 176 #if defined(ENABLE_RLZ)
174 #include "chrome/browser/rlz/rlz.h" 177 #include "chrome/browser/rlz/rlz.h"
175 #endif 178 #endif
176 179
177 #if defined(TOOLKIT_VIEWS) 180 #if defined(TOOLKIT_VIEWS)
178 #include "ui/views/focus/accelerator_handler.h" 181 #include "ui/views/focus/accelerator_handler.h"
179 #endif 182 #endif
180 183
181 #if defined(USE_X11) 184 #if defined(USE_X11)
182 #include "chrome/browser/chrome_browser_main_x11.h" 185 #include "chrome/browser/chrome_browser_main_x11.h"
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { 1330 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) {
1328 FilePath path = 1331 FilePath path =
1329 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); 1332 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
1330 printing::PrintedDocument::set_debug_dump_path(path); 1333 printing::PrintedDocument::set_debug_dump_path(path);
1331 } 1334 }
1332 #endif 1335 #endif
1333 1336
1334 HandleTestParameters(parsed_command_line()); 1337 HandleTestParameters(parsed_command_line());
1335 RecordBreakpadStatusUMA(browser_process_->metrics_service()); 1338 RecordBreakpadStatusUMA(browser_process_->metrics_service());
1336 about_flags::RecordUMAStatistics(local_state_); 1339 about_flags::RecordUMAStatistics(local_state_);
1340 #if defined(ENABLE_LANGUAGE_DETECTION)
1337 LanguageUsageMetrics::RecordAcceptLanguages( 1341 LanguageUsageMetrics::RecordAcceptLanguages(
1338 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); 1342 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
1339 LanguageUsageMetrics::RecordApplicationLanguage( 1343 LanguageUsageMetrics::RecordApplicationLanguage(
1340 browser_process_->GetApplicationLocale()); 1344 browser_process_->GetApplicationLocale());
1345 #endif
1341 1346
1342 // The extension service may be available at this point. If the command line 1347 // The extension service may be available at this point. If the command line
1343 // specifies --uninstall-extension, attempt the uninstall extension startup 1348 // specifies --uninstall-extension, attempt the uninstall extension startup
1344 // action. 1349 // action.
1345 if (parsed_command_line().HasSwitch(switches::kUninstallExtension)) { 1350 if (parsed_command_line().HasSwitch(switches::kUninstallExtension)) {
1346 extensions::StartupHelper extension_startup_helper; 1351 extensions::StartupHelper extension_startup_helper;
1347 if (extension_startup_helper.UninstallExtension( 1352 if (extension_startup_helper.UninstallExtension(
1348 parsed_command_line(), profile_)) 1353 parsed_command_line(), profile_))
1349 return content::RESULT_CODE_NORMAL_EXIT; 1354 return content::RESULT_CODE_NORMAL_EXIT;
1350 return chrome::RESULT_CODE_UNINSTALL_EXTENSION_ERROR; 1355 return chrome::RESULT_CODE_UNINSTALL_EXTENSION_ERROR;
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 if (base::win::GetVersion() <= base::win::VERSION_XP) 1689 if (base::win::GetVersion() <= base::win::VERSION_XP)
1685 uma_name += "_XP"; 1690 uma_name += "_XP";
1686 1691
1687 uma_name += "_PreRead_"; 1692 uma_name += "_PreRead_";
1688 uma_name += pre_read_percentage; 1693 uma_name += pre_read_percentage;
1689 AddPreReadHistogramTime(uma_name.c_str(), time); 1694 AddPreReadHistogramTime(uma_name.c_str(), time);
1690 } 1695 }
1691 #endif 1696 #endif
1692 #endif 1697 #endif
1693 } 1698 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698