Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 #include "grit/app_locale_settings.h" | 126 #include "grit/app_locale_settings.h" |
| 127 #include "grit/browser_resources.h" | 127 #include "grit/browser_resources.h" |
| 128 #include "grit/chromium_strings.h" | 128 #include "grit/chromium_strings.h" |
| 129 #include "grit/generated_resources.h" | 129 #include "grit/generated_resources.h" |
| 130 #include "grit/platform_locale_settings.h" | 130 #include "grit/platform_locale_settings.h" |
| 131 #include "net/base/net_module.h" | 131 #include "net/base/net_module.h" |
| 132 #include "net/base/sdch_manager.h" | 132 #include "net/base/sdch_manager.h" |
| 133 #include "net/cookies/cookie_monster.h" | 133 #include "net/cookies/cookie_monster.h" |
| 134 #include "net/http/http_network_layer.h" | 134 #include "net/http/http_network_layer.h" |
| 135 #include "net/http/http_stream_factory.h" | 135 #include "net/http/http_stream_factory.h" |
| 136 #include "net/socket/ssl_client_socket_pool.h" | |
| 136 #include "net/url_request/url_request.h" | 137 #include "net/url_request/url_request.h" |
| 137 #include "ui/base/l10n/l10n_util.h" | 138 #include "ui/base/l10n/l10n_util.h" |
| 138 #include "ui/base/layout.h" | 139 #include "ui/base/layout.h" |
| 139 #include "ui/base/resource/resource_bundle.h" | 140 #include "ui/base/resource/resource_bundle.h" |
| 140 | 141 |
| 141 #if defined(OS_ANDROID) | 142 #if defined(OS_ANDROID) |
| 142 #include "chrome/browser/metrics/thread_watcher_android.h" | 143 #include "chrome/browser/metrics/thread_watcher_android.h" |
| 143 #else | 144 #else |
| 144 #include "chrome/browser/feedback/feedback_profile_observer.h" | 145 #include "chrome/browser/feedback/feedback_profile_observer.h" |
| 145 #endif | 146 #endif |
| (...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1346 // | 1347 // |
| 1347 // A simpler way of doing all this would be to have some function which could | 1348 // A simpler way of doing all this would be to have some function which could |
| 1348 // give the time elapsed since startup, and simply have this object check that | 1349 // give the time elapsed since startup, and simply have this object check that |
| 1349 // when asked to initialize itself, but this doesn't seem to exist. | 1350 // when asked to initialize itself, but this doesn't seem to exist. |
| 1350 // | 1351 // |
| 1351 // This can't be created in the BrowserProcessImpl constructor because it | 1352 // This can't be created in the BrowserProcessImpl constructor because it |
| 1352 // needs to read prefs that get set after that runs. | 1353 // needs to read prefs that get set after that runs. |
| 1353 browser_process_->intranet_redirect_detector(); | 1354 browser_process_->intranet_redirect_detector(); |
| 1354 GoogleSearchCounter::RegisterForNotifications(); | 1355 GoogleSearchCounter::RegisterForNotifications(); |
| 1355 | 1356 |
| 1357 if (parsed_command_line().HasSwitch(switches::kEnableSSLConnectJobWaiting)) { | |
| 1358 net::SSLConnectJob::EnableJobWaiting(true); | |
| 1359 } | |
|
wtc
2014/06/27 00:36:49
Nit: omit curly braces, which is the style used in
| |
| 1360 | |
| 1356 if (parsed_command_line().HasSwitch(switches::kEnableSdchOverHttps)) { | 1361 if (parsed_command_line().HasSwitch(switches::kEnableSdchOverHttps)) { |
| 1357 net::SdchManager::EnableSecureSchemeSupport(true); | 1362 net::SdchManager::EnableSecureSchemeSupport(true); |
| 1358 } else { | 1363 } else { |
| 1359 // Check SDCH field trial. | 1364 // Check SDCH field trial. |
| 1360 const char kSdchFieldTrialName[] = "SDCH"; | 1365 const char kSdchFieldTrialName[] = "SDCH"; |
| 1361 const char kEnabledAllGroupName[] = "EnabledAll"; | 1366 const char kEnabledAllGroupName[] = "EnabledAll"; |
| 1362 const char kEnabledHttpOnlyGroupName[] = "EnabledHttpOnly"; | 1367 const char kEnabledHttpOnlyGroupName[] = "EnabledHttpOnly"; |
| 1363 const char kDisabledAllGroupName[] = "DisabledAll"; | 1368 const char kDisabledAllGroupName[] = "DisabledAll"; |
| 1364 | 1369 |
| 1365 base::StringPiece sdch_trial_group = | 1370 base::StringPiece sdch_trial_group = |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1654 chromeos::CrosSettings::Shutdown(); | 1659 chromeos::CrosSettings::Shutdown(); |
| 1655 #endif | 1660 #endif |
| 1656 #endif | 1661 #endif |
| 1657 } | 1662 } |
| 1658 | 1663 |
| 1659 // Public members: | 1664 // Public members: |
| 1660 | 1665 |
| 1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1666 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1662 chrome_extra_parts_.push_back(parts); | 1667 chrome_extra_parts_.push_back(parts); |
| 1663 } | 1668 } |
| OLD | NEW |