| 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 // Initialize magnification manager before ash tray is created. And this must | 494 // Initialize magnification manager before ash tray is created. And this must |
| 495 // be placed after UserManager::SessionStarted(); | 495 // be placed after UserManager::SessionStarted(); |
| 496 chromeos::MagnificationManager::Initialize(); | 496 chromeos::MagnificationManager::Initialize(); |
| 497 | 497 |
| 498 #if defined(USE_LINUX_BREAKPAD) | 498 #if defined(USE_LINUX_BREAKPAD) |
| 499 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, | 499 cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL, |
| 500 base::Bind(&ChromeOSVersionCallback), | 500 base::Bind(&ChromeOSVersionCallback), |
| 501 &tracker_); | 501 &tracker_); |
| 502 #endif | 502 #endif |
| 503 | 503 |
| 504 #if defined(ENABLE_RLZ) | |
| 505 if (parsed_command_line().HasSwitch(::switches::kTestType)) | |
| 506 RLZTracker::EnableZeroDelayForTesting(); | |
| 507 #endif | |
| 508 | |
| 509 // In Aura builds this will initialize ash::Shell. | 504 // In Aura builds this will initialize ash::Shell. |
| 510 ChromeBrowserMainPartsLinux::PreProfileInit(); | 505 ChromeBrowserMainPartsLinux::PreProfileInit(); |
| 511 } | 506 } |
| 512 | 507 |
| 513 void ChromeBrowserMainPartsChromeos::PostProfileInit() { | 508 void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| 514 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 509 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 515 // -- just after CreateProfile(). | 510 // -- just after CreateProfile(). |
| 516 | 511 |
| 517 policy::BrowserPolicyConnector* connector = | 512 policy::BrowserPolicyConnector* connector = |
| 518 g_browser_process->browser_policy_connector(); | 513 g_browser_process->browser_policy_connector(); |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 } else if (trial->group() == margin_200mb) { | 731 } else if (trial->group() == margin_200mb) { |
| 737 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; | 732 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; |
| 738 LowMemoryObserver::SetLowMemoryMargin(200); | 733 LowMemoryObserver::SetLowMemoryMargin(200); |
| 739 } else { | 734 } else { |
| 740 LOG(WARNING) << "low_mem: Part of 'default' experiment"; | 735 LOG(WARNING) << "low_mem: Part of 'default' experiment"; |
| 741 } | 736 } |
| 742 } | 737 } |
| 743 } | 738 } |
| 744 | 739 |
| 745 } // namespace chromeos | 740 } // namespace chromeos |
| OLD | NEW |