| 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/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 // specified so explicitly. | 412 // specified so explicitly. |
| 413 const PrefService::Preference* use_shared_proxies_pref = | 413 const PrefService::Preference* use_shared_proxies_pref = |
| 414 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies); | 414 profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies); |
| 415 if (use_shared_proxies_pref->IsDefaultValue()) | 415 if (use_shared_proxies_pref->IsDefaultValue()) |
| 416 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); | 416 profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); |
| 417 } | 417 } |
| 418 | 418 |
| 419 network_config_updater_.reset( | 419 network_config_updater_.reset( |
| 420 new policy::NetworkConfigurationUpdater( | 420 new policy::NetworkConfigurationUpdater( |
| 421 g_browser_process->policy_service(), | 421 g_browser_process->policy_service(), |
| 422 chromeos::CrosLibrary::Get()->GetNetworkLibrary())); | 422 g_browser_process->browser_policy_connector(), |
| 423 chromeos::CrosLibrary::Get()->GetNetworkLibrary(), |
| 424 chromeos::UserManager::Get())); |
| 423 | 425 |
| 424 // Make sure that wallpaper boot transition and other delays in OOBE | 426 // Make sure that wallpaper boot transition and other delays in OOBE |
| 425 // are disabled for tests by default. | 427 // are disabled for tests by default. |
| 426 // Individual tests may enable them if they want. | 428 // Individual tests may enable them if they want. |
| 427 if (parsed_command_line().HasSwitch(switches::kTestType)) | 429 if (parsed_command_line().HasSwitch(switches::kTestType)) |
| 428 chromeos::WizardController::SetZeroDelays(); | 430 chromeos::WizardController::SetZeroDelays(); |
| 429 | 431 |
| 430 // Tests should be able to tune login manager before showing it. | 432 // Tests should be able to tune login manager before showing it. |
| 431 // Thus only show login manager in normal (non-testing) mode. | 433 // Thus only show login manager in normal (non-testing) mode. |
| 432 if (!parameters().ui_task) | 434 if (!parameters().ui_task) |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; | 591 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; |
| 590 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); | 592 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); |
| 591 } else if (trial->group() == margin_200mb) { | 593 } else if (trial->group() == margin_200mb) { |
| 592 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 594 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
| 593 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); | 595 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); |
| 594 } else { | 596 } else { |
| 595 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 597 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
| 596 } | 598 } |
| 597 } | 599 } |
| 598 } | 600 } |
| OLD | NEW |