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

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

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 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
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 <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
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 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 std::string sdch_trial_group_string = 1413 std::string sdch_trial_group_string =
1414 base::FieldTrialList::FindFullName(kSdchFieldTrialName); 1414 base::FieldTrialList::FindFullName(kSdchFieldTrialName);
1415 base::StringPiece sdch_trial_group(sdch_trial_group_string); 1415 base::StringPiece sdch_trial_group(sdch_trial_group_string);
1416 if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) { 1416 if (sdch_trial_group.starts_with(kEnabledHttpOnlyGroupName)) {
1417 net::SdchManager::EnableSdchSupport(true); 1417 net::SdchManager::EnableSdchSupport(true);
1418 net::SdchManager::EnableSecureSchemeSupport(false); 1418 net::SdchManager::EnableSecureSchemeSupport(false);
1419 } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) { 1419 } else if (sdch_trial_group.starts_with(kDisabledAllGroupName)) {
1420 net::SdchManager::EnableSdchSupport(false); 1420 net::SdchManager::EnableSdchSupport(false);
1421 } 1421 }
1422 1422
1423 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) 1423 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
1424 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { 1424 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) {
1425 base::FilePath path = 1425 base::FilePath path =
1426 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); 1426 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint);
1427 printing::PrintedDocument::set_debug_dump_path(path); 1427 printing::PrintedDocument::set_debug_dump_path(path);
1428 } 1428 }
1429 #endif 1429 #endif
1430 1430
1431 VLOG(2) << "PreMainMessageLoopRunImpl : HandleTestParameters"; 1431 VLOG(2) << "PreMainMessageLoopRunImpl : HandleTestParameters";
1432 HandleTestParameters(parsed_command_line()); 1432 HandleTestParameters(parsed_command_line());
1433 browser_process_->metrics_service()->RecordBreakpadHasDebugger( 1433 browser_process_->metrics_service()->RecordBreakpadHasDebugger(
(...skipping 13 matching lines...) Expand all
1447 startup_watcher_->Arm(base::TimeDelta::FromSeconds(600)); 1447 startup_watcher_->Arm(base::TimeDelta::FromSeconds(600));
1448 1448
1449 // On mobile, need for clean shutdown arises only when the application comes 1449 // On mobile, need for clean shutdown arises only when the application comes
1450 // to foreground (i.e. MetricsService::OnAppEnterForeground is called). 1450 // to foreground (i.e. MetricsService::OnAppEnterForeground is called).
1451 // http://crbug.com/179143 1451 // http://crbug.com/179143
1452 #if !defined(OS_ANDROID) 1452 #if !defined(OS_ANDROID)
1453 // Start watching for a hang. 1453 // Start watching for a hang.
1454 browser_process_->metrics_service()->LogNeedForCleanShutdown(); 1454 browser_process_->metrics_service()->LogNeedForCleanShutdown();
1455 #endif 1455 #endif
1456 1456
1457 #if defined(ENABLE_FULL_PRINTING) 1457 #if defined(ENABLE_PRINT_PREVIEW)
1458 // Create the instance of the cloud print proxy service so that it can launch 1458 // Create the instance of the cloud print proxy service so that it can launch
1459 // the service process if needed. This is needed because the service process 1459 // the service process if needed. This is needed because the service process
1460 // might have shutdown because an update was available. 1460 // might have shutdown because an update was available.
1461 // TODO(torne): this should maybe be done with 1461 // TODO(torne): this should maybe be done with
1462 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext() 1462 // BrowserContextKeyedServiceFactory::ServiceIsCreatedWithBrowserContext()
1463 // instead? 1463 // instead?
1464 CloudPrintProxyServiceFactory::GetForProfile(profile_); 1464 CloudPrintProxyServiceFactory::GetForProfile(profile_);
1465 #endif 1465 #endif
1466 1466
1467 // Start watching all browser threads for responsiveness. 1467 // Start watching all browser threads for responsiveness.
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 chromeos::CrosSettings::Shutdown(); 1710 chromeos::CrosSettings::Shutdown();
1711 #endif 1711 #endif
1712 #endif 1712 #endif
1713 } 1713 }
1714 1714
1715 // Public members: 1715 // Public members:
1716 1716
1717 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1717 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1718 chrome_extra_parts_.push_back(parts); 1718 chrome_extra_parts_.push_back(parts);
1719 } 1719 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698