| 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 "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 // Initialize magnification manager before ash tray is created. And this must | 510 // Initialize magnification manager before ash tray is created. And this must |
| 511 // be placed after UserManager::SessionStarted(); | 511 // be placed after UserManager::SessionStarted(); |
| 512 chromeos::MagnificationManager::Initialize(); | 512 chromeos::MagnificationManager::Initialize(); |
| 513 | 513 |
| 514 #if defined(USE_LINUX_BREAKPAD) | 514 #if defined(USE_LINUX_BREAKPAD) |
| 515 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, | 515 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, |
| 516 base::Bind(&ChromeOSVersionCallback), | 516 base::Bind(&ChromeOSVersionCallback), |
| 517 &tracker_); | 517 &tracker_); |
| 518 #endif | 518 #endif |
| 519 | 519 |
| 520 #if defined(ENABLE_RLZ) | |
| 521 if (parsed_command_line().HasSwitch(::switches::kTestType)) | |
| 522 RLZTracker::EnableZeroDelayForTesting(); | |
| 523 #endif | |
| 524 | |
| 525 // In Aura builds this will initialize ash::Shell. | 520 // In Aura builds this will initialize ash::Shell. |
| 526 ChromeBrowserMainPartsLinux::PreProfileInit(); | 521 ChromeBrowserMainPartsLinux::PreProfileInit(); |
| 527 } | 522 } |
| 528 | 523 |
| 529 void ChromeBrowserMainPartsChromeos::PostProfileInit() { | 524 void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| 530 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 525 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 531 // -- just after CreateProfile(). | 526 // -- just after CreateProfile(). |
| 532 | 527 |
| 533 policy::BrowserPolicyConnector* connector = | 528 policy::BrowserPolicyConnector* connector = |
| 534 g_browser_process->browser_policy_connector(); | 529 g_browser_process->browser_policy_connector(); |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 } else if (trial->group() == margin_200mb) { | 749 } else if (trial->group() == margin_200mb) { |
| 755 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 750 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
| 756 LowMemoryObserver::SetLowMemoryMargin(200); | 751 LowMemoryObserver::SetLowMemoryMargin(200); |
| 757 } else { | 752 } else { |
| 758 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 753 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
| 759 } | 754 } |
| 760 } | 755 } |
| 761 } | 756 } |
| 762 | 757 |
| 763 } // namespace chromeos | 758 } // namespace chromeos |
| OLD | NEW |