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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 #if !defined(DISABLE_NACL) | 185 #if !defined(DISABLE_NACL) |
186 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 186 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
187 #include "components/nacl/browser/nacl_process_host.h" | 187 #include "components/nacl/browser/nacl_process_host.h" |
188 #endif | 188 #endif |
189 | 189 |
190 #if defined(ENABLE_EXTENSIONS) | 190 #if defined(ENABLE_EXTENSIONS) |
191 #include "chrome/browser/extensions/startup_helper.h" | 191 #include "chrome/browser/extensions/startup_helper.h" |
192 #include "extensions/browser/extension_protocols.h" | 192 #include "extensions/browser/extension_protocols.h" |
193 #endif | 193 #endif |
194 | 194 |
195 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 195 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
196 #include "printing/printed_document.h" | 196 #include "printing/printed_document.h" |
197 #endif | 197 #endif |
198 | 198 |
199 #if defined(ENABLE_RLZ) | 199 #if defined(ENABLE_RLZ) |
200 #include "chrome/browser/rlz/rlz.h" | 200 #include "chrome/browser/rlz/rlz.h" |
201 #endif | 201 #endif |
202 | 202 |
203 #if defined(ENABLE_WEBRTC) | 203 #if defined(ENABLE_WEBRTC) |
204 #include "chrome/browser/media/webrtc_log_util.h" | 204 #include "chrome/browser/media/webrtc_log_util.h" |
205 #endif | 205 #endif |
(...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1412 std::string sdch_trial_group_string = | 1412 std::string sdch_trial_group_string = |
1413 base::FieldTrialList::FindFullName(kSdchFieldTrialName); | 1413 base::FieldTrialList::FindFullName(kSdchFieldTrialName); |
1414 base::StringPiece sdch_trial_group(sdch_trial_group_string); | 1414 base::StringPiece sdch_trial_group(sdch_trial_group_string); |
1415 if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) { | 1415 if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) { |
1416 net::SdchManager::EnableSdchSupport(true); | 1416 net::SdchManager::EnableSdchSupport(true); |
1417 net::SdchManager::EnableSecureSchemeSupport(false); | 1417 net::SdchManager::EnableSecureSchemeSupport(false); |
1418 } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) { | 1418 } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) { |
1419 net::SdchManager::EnableSdchSupport(false); | 1419 net::SdchManager::EnableSdchSupport(false); |
1420 } | 1420 } |
1421 | 1421 |
1422 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 1422 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
1423 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { | 1423 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { |
1424 base::FilePath path = | 1424 base::FilePath path = |
1425 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); | 1425 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); |
1426 printing::PrintedDocument::set_debug_dump_path(path); | 1426 printing::PrintedDocument::set_debug_dump_path(path); |
1427 } | 1427 } |
1428 #endif | 1428 #endif |
1429 | 1429 |
1430 HandleTestParameters(parsed_command_line()); | 1430 HandleTestParameters(parsed_command_line()); |
1431 browser_process_->metrics_service()->RecordBreakpadHasDebugger( | 1431 browser_process_->metrics_service()->RecordBreakpadHasDebugger( |
1432 base::debug::BeingDebugged()); | 1432 base::debug::BeingDebugged()); |
(...skipping 12 matching lines...) Expand all Loading... |
1445 startup_watcher_->Arm(base::TimeDelta::FromSeconds(600)); | 1445 startup_watcher_->Arm(base::TimeDelta::FromSeconds(600)); |
1446 | 1446 |
1447 // On mobile, need for clean shutdown arises only when the application comes | 1447 // On mobile, need for clean shutdown arises only when the application comes |
1448 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). | 1448 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). |
1449 // http://crbug.com/179143 | 1449 // http://crbug.com/179143 |
1450 #if !defined(OS_ANDROID) | 1450 #if !defined(OS_ANDROID) |
1451 // Start watching for a hang. | 1451 // Start watching for a hang. |
1452 browser_process_->metrics_service()->LogNeedForCleanShutdown(); | 1452 browser_process_->metrics_service()->LogNeedForCleanShutdown(); |
1453 #endif | 1453 #endif |
1454 | 1454 |
1455 #if defined(ENABLE_FULL_PRINTING) | 1455 #if defined(ENABLE_PRINT_PREVIEW) |
1456 // Create the instance of the cloud print proxy service so that it can launch | 1456 // Create the instance of the cloud print proxy service so that it can launch |
1457 // the service process if needed. This is needed because the service process | 1457 // the service process if needed. This is needed because the service process |
1458 // might have shutdown because an update was available. | 1458 // might have shutdown because an update was available. |
1459 // TODO(torne): this should maybe be done with | 1459 // TODO(torne): this should maybe be done with |
1460 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() | 1460 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() |
1461 // instead? | 1461 // instead? |
1462 CloudPrintProxyServiceFactory::GetForProfile(profile_); | 1462 CloudPrintProxyServiceFactory::GetForProfile(profile_); |
1463 #endif | 1463 #endif |
1464 | 1464 |
1465 // Start watching all browser threads for responsiveness. | 1465 // Start watching all browser threads for responsiveness. |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1699 chromeos::CrosSettings::Shutdown(); | 1699 chromeos::CrosSettings::Shutdown(); |
1700 #endif | 1700 #endif |
1701 #endif | 1701 #endif |
1702 } | 1702 } |
1703 | 1703 |
1704 // Public members: | 1704 // Public members: |
1705 | 1705 |
1706 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1706 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1707 chrome_extra_parts_.push_back(parts); | 1707 chrome_extra_parts_.push_back(parts); |
1708 } | 1708 } |
OLD | NEW |