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

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

Issue 18820002: Remove ENABLE_LANGUAGE_DETECTION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: mis-rebased Created 7 years, 5 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 | « 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 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "chrome/browser/extensions/extension_service.h" 55 #include "chrome/browser/extensions/extension_service.h"
56 #include "chrome/browser/extensions/message_handler.h" 56 #include "chrome/browser/extensions/message_handler.h"
57 #include "chrome/browser/extensions/startup_helper.h" 57 #include "chrome/browser/extensions/startup_helper.h"
58 #include "chrome/browser/first_run/first_run.h" 58 #include "chrome/browser/first_run/first_run.h"
59 #include "chrome/browser/first_run/upgrade_util.h" 59 #include "chrome/browser/first_run/upgrade_util.h"
60 #include "chrome/browser/google/google_search_counter.h" 60 #include "chrome/browser/google/google_search_counter.h"
61 #include "chrome/browser/google/google_util.h" 61 #include "chrome/browser/google/google_util.h"
62 #include "chrome/browser/gpu/chrome_gpu_util.h" 62 #include "chrome/browser/gpu/chrome_gpu_util.h"
63 #include "chrome/browser/gpu/gl_string_manager.h" 63 #include "chrome/browser/gpu/gl_string_manager.h"
64 #include "chrome/browser/jankometer.h" 64 #include "chrome/browser/jankometer.h"
65 #include "chrome/browser/language_usage_metrics.h"
65 #include "chrome/browser/metrics/field_trial_synchronizer.h" 66 #include "chrome/browser/metrics/field_trial_synchronizer.h"
66 #include "chrome/browser/metrics/metrics_log.h" 67 #include "chrome/browser/metrics/metrics_log.h"
67 #include "chrome/browser/metrics/metrics_service.h" 68 #include "chrome/browser/metrics/metrics_service.h"
68 #include "chrome/browser/metrics/thread_watcher.h" 69 #include "chrome/browser/metrics/thread_watcher.h"
69 #include "chrome/browser/metrics/tracking_synchronizer.h" 70 #include "chrome/browser/metrics/tracking_synchronizer.h"
70 #include "chrome/browser/metrics/variations/variations_service.h" 71 #include "chrome/browser/metrics/variations/variations_service.h"
71 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 72 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
72 #include "chrome/browser/nacl_host/nacl_process_host.h" 73 #include "chrome/browser/nacl_host/nacl_process_host.h"
73 #include "chrome/browser/net/chrome_net_log.h" 74 #include "chrome/browser/net/chrome_net_log.h"
74 #include "chrome/browser/net/crl_set_fetcher.h" 75 #include "chrome/browser/net/crl_set_fetcher.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 #include "ui/base/win/dpi.h" 180 #include "ui/base/win/dpi.h"
180 #endif // defined(OS_WIN) 181 #endif // defined(OS_WIN)
181 182
182 #if defined(OS_MACOSX) 183 #if defined(OS_MACOSX)
183 #include <Security/Security.h> 184 #include <Security/Security.h>
184 185
185 #include "base/mac/scoped_nsautorelease_pool.h" 186 #include "base/mac/scoped_nsautorelease_pool.h"
186 #include "chrome/browser/mac/keystone_glue.h" 187 #include "chrome/browser/mac/keystone_glue.h"
187 #endif 188 #endif
188 189
189 #if defined(ENABLE_LANGUAGE_DETECTION)
190 #include "chrome/browser/language_usage_metrics.h"
191 #endif
192
193 #if defined(ENABLE_RLZ) 190 #if defined(ENABLE_RLZ)
194 #include "chrome/browser/rlz/rlz.h" 191 #include "chrome/browser/rlz/rlz.h"
195 #endif 192 #endif
196 193
197 #if defined(TOOLKIT_VIEWS) 194 #if defined(TOOLKIT_VIEWS)
198 #include "ui/views/focus/accelerator_handler.h" 195 #include "ui/views/focus/accelerator_handler.h"
199 #endif 196 #endif
200 197
201 using content::BrowserThread; 198 using content::BrowserThread;
202 199
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 base::FilePath path = 1464 base::FilePath path =
1468 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); 1465 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
1469 printing::PrintedDocument::set_debug_dump_path(path); 1466 printing::PrintedDocument::set_debug_dump_path(path);
1470 } 1467 }
1471 #endif 1468 #endif
1472 1469
1473 HandleTestParameters(parsed_command_line()); 1470 HandleTestParameters(parsed_command_line());
1474 browser_process_->metrics_service()->RecordBreakpadHasDebugger( 1471 browser_process_->metrics_service()->RecordBreakpadHasDebugger(
1475 base::debug::BeingDebugged()); 1472 base::debug::BeingDebugged());
1476 1473
1477 #if defined(ENABLE_LANGUAGE_DETECTION)
1478 LanguageUsageMetrics::RecordAcceptLanguages( 1474 LanguageUsageMetrics::RecordAcceptLanguages(
1479 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); 1475 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
1480 LanguageUsageMetrics::RecordApplicationLanguage( 1476 LanguageUsageMetrics::RecordApplicationLanguage(
1481 browser_process_->GetApplicationLocale()); 1477 browser_process_->GetApplicationLocale());
1482 #endif
1483 1478
1484 // The extension service may be available at this point. If the command line 1479 // The extension service may be available at this point. If the command line
1485 // specifies --uninstall-extension, attempt the uninstall extension startup 1480 // specifies --uninstall-extension, attempt the uninstall extension startup
1486 // action. 1481 // action.
1487 if (parsed_command_line().HasSwitch(switches::kUninstallExtension)) { 1482 if (parsed_command_line().HasSwitch(switches::kUninstallExtension)) {
1488 extensions::StartupHelper extension_startup_helper; 1483 extensions::StartupHelper extension_startup_helper;
1489 if (extension_startup_helper.UninstallExtension( 1484 if (extension_startup_helper.UninstallExtension(
1490 parsed_command_line(), profile_)) 1485 parsed_command_line(), profile_))
1491 return content::RESULT_CODE_NORMAL_EXIT; 1486 return content::RESULT_CODE_NORMAL_EXIT;
1492 return chrome::RESULT_CODE_UNINSTALL_EXTENSION_ERROR; 1487 return chrome::RESULT_CODE_UNINSTALL_EXTENSION_ERROR;
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1736 chromeos::CrosSettings::Shutdown(); 1731 chromeos::CrosSettings::Shutdown();
1737 #endif 1732 #endif
1738 #endif 1733 #endif
1739 } 1734 }
1740 1735
1741 // Public members: 1736 // Public members:
1742 1737
1743 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1738 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1744 chrome_extra_parts_.push_back(parts); 1739 chrome_extra_parts_.push_back(parts);
1745 } 1740 }
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