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 #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 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1384 // | 1384 // |
1385 // A simpler way of doing all this would be to have some function which could | 1385 // A simpler way of doing all this would be to have some function which could |
1386 // give the time elapsed since startup, and simply have this object check that | 1386 // give the time elapsed since startup, and simply have this object check that |
1387 // when asked to initialize itself, but this doesn't seem to exist. | 1387 // when asked to initialize itself, but this doesn't seem to exist. |
1388 // | 1388 // |
1389 // This can't be created in the BrowserProcessImpl constructor because it | 1389 // This can't be created in the BrowserProcessImpl constructor because it |
1390 // needs to read prefs that get set after that runs. | 1390 // needs to read prefs that get set after that runs. |
1391 browser_process_->intranet_redirect_detector(); | 1391 browser_process_->intranet_redirect_detector(); |
1392 GoogleSearchCounter::RegisterForNotifications(); | 1392 GoogleSearchCounter::RegisterForNotifications(); |
1393 | 1393 |
1394 if (parsed_command_line().HasSwitch(switches::kEnableSdch)) { | 1394 if (parsed_command_line().HasSwitch(switches::kEnableSdchOverHttps)) { |
mef
2014/02/24 21:41:37
Would it make sense to replace command line switch
willchan no longer on Chromium
2014/02/24 21:45:57
I dunno. It's up to you :)
| |
1395 // SDCH options via switches::kEnableSdch include: | 1395 net::SdchManager::EnableSecureSchemeSupport(true); |
1396 const int kSdchDisabled = 0; | |
1397 const int kSdchOverHttpEnabled = 1; | |
1398 const int kSdchOverBothHttpAndHttpsEnabled = 2; | |
1399 int sdch_enabled = kSdchOverHttpEnabled; | |
1400 if (base::StringToInt(parsed_command_line().GetSwitchValueASCII( | |
1401 switches::kEnableSdch), &sdch_enabled)) { | |
1402 if (sdch_enabled == kSdchDisabled) { | |
1403 net::SdchManager::EnableSdchSupport(false); | |
mef
2014/02/24 21:41:37
Is it OK that if we remove this option, then there
willchan no longer on Chromium
2014/02/24 21:45:57
I assert yes, according to the policies laid out i
| |
1404 } else if (sdch_enabled == kSdchOverBothHttpAndHttpsEnabled) { | |
1405 net::SdchManager::EnableSecureSchemeSupport(true); | |
1406 } | |
1407 } | |
1408 } | 1396 } |
1409 | 1397 |
1410 if (parsed_command_line().HasSwitch(switches::kEnableWatchdog)) | 1398 if (parsed_command_line().HasSwitch(switches::kEnableWatchdog)) |
1411 InstallJankometer(parsed_command_line()); | 1399 InstallJankometer(parsed_command_line()); |
1412 | 1400 |
1413 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) | 1401 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD) |
1414 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { | 1402 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { |
1415 base::FilePath path = | 1403 base::FilePath path = |
1416 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); | 1404 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); |
1417 printing::PrintedDocument::set_debug_dump_path(path); | 1405 printing::PrintedDocument::set_debug_dump_path(path); |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1693 chromeos::CrosSettings::Shutdown(); | 1681 chromeos::CrosSettings::Shutdown(); |
1694 #endif | 1682 #endif |
1695 #endif | 1683 #endif |
1696 } | 1684 } |
1697 | 1685 |
1698 // Public members: | 1686 // Public members: |
1699 | 1687 |
1700 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1688 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1701 chrome_extra_parts_.push_back(parts); | 1689 chrome_extra_parts_.push_back(parts); |
1702 } | 1690 } |
OLD | NEW |