Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/hi_res_timer_manager.h" | 9 #include "app/hi_res_timer_manager.h" |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 755 #endif // OS_POSIX | 755 #endif // OS_POSIX |
| 756 } | 756 } |
| 757 Browser::SetNewHomePagePrefs(user_prefs); | 757 Browser::SetNewHomePagePrefs(user_prefs); |
| 758 } | 758 } |
| 759 | 759 |
| 760 // Sets things up so that if we crash from this point on, a dialog will | 760 // Sets things up so that if we crash from this point on, a dialog will |
| 761 // popup asking the user to restart chrome. It is done this late to avoid | 761 // popup asking the user to restart chrome. It is done this late to avoid |
| 762 // testing against a bunch of special cases that are taken care early on. | 762 // testing against a bunch of special cases that are taken care early on. |
| 763 PrepareRestartOnCrashEnviroment(parsed_command_line); | 763 PrepareRestartOnCrashEnviroment(parsed_command_line); |
| 764 | 764 |
| 765 // Initialize and maintain DNS prefetcher module. | 765 // Initialize and maintain DNS prefetcher module. Also registers an observer |
| 766 chrome_browser_net::DnsPrefetcherInit dns_prefetch(user_prefs, local_state); | 766 // to clear the host cache when closing incognito mode |
|
jar (doing other things)
2010/01/09 02:16:29
nit: period at end of sentence.
| |
| 767 chrome_browser_net::DnsGlobalInit dns_prefetch(user_prefs, local_state); | |
| 767 | 768 |
| 768 scoped_refptr<FieldTrial> socket_late_binding_trial = | 769 scoped_refptr<FieldTrial> socket_late_binding_trial = |
| 769 new FieldTrial("SocketLateBinding", 100); | 770 new FieldTrial("SocketLateBinding", 100); |
| 770 socket_late_binding_trial->AppendGroup("_disable_late_binding", 50); | 771 socket_late_binding_trial->AppendGroup("_disable_late_binding", 50); |
| 771 const int late_binding_group = | 772 const int late_binding_group = |
| 772 socket_late_binding_trial->AppendGroup("_enable_late_binding", 50); | 773 socket_late_binding_trial->AppendGroup("_enable_late_binding", 50); |
| 773 if (socket_late_binding_trial->group() == late_binding_group) | 774 if (socket_late_binding_trial->group() == late_binding_group) |
| 774 net::EnableLateBindingOfSockets(true); | 775 net::EnableLateBindingOfSockets(true); |
| 775 | 776 |
| 776 #if defined(OS_WIN) | 777 #if defined(OS_WIN) |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 925 if (metrics) | 926 if (metrics) |
| 926 metrics->Stop(); | 927 metrics->Stop(); |
| 927 | 928 |
| 928 // browser_shutdown takes care of deleting browser_process, so we need to | 929 // browser_shutdown takes care of deleting browser_process, so we need to |
| 929 // release it. | 930 // release it. |
| 930 browser_process.release(); | 931 browser_process.release(); |
| 931 browser_shutdown::Shutdown(); | 932 browser_shutdown::Shutdown(); |
| 932 | 933 |
| 933 return result_code; | 934 return result_code; |
| 934 } | 935 } |
| OLD | NEW |