From a33747b58ef3bab43d62cd17082d7f699fb71914 Mon Sep 17 00:00:00 2001 From: "kaiwang@chromium.org" Date: Thu, 15 Nov 2012 00:10:38 +0000 Subject: Convert some chromeos related code to not depend on cancelable_request. This is the second try of http://codereview.chromium.org/11359173/ BUG=155883 TBR=jhawkins@chromium.org Review URL: https://codereview.chromium.org/11358246 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167780 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_browser_main_linux.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chrome/browser/chrome_browser_main_linux.cc') diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index e764919..fc4cb9e 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -34,9 +34,8 @@ namespace { #if defined(USE_LINUX_BREAKPAD) #if defined(OS_CHROMEOS) -void ChromeOSVersionCallback(chromeos::VersionLoader::Handle, - const std::string& version) { - base::SetLinuxDistro(std::string("CrOS ") + version); +void ChromeOSVersionCallback(const std::string* version) { + base::SetLinuxDistro(std::string("CrOS ") + *version); } #else void GetLinuxDistroCallback() { @@ -93,9 +92,9 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() { void ChromeBrowserMainPartsLinux::PreProfileInit() { #if defined(USE_LINUX_BREAKPAD) #if defined(OS_CHROMEOS) - cros_version_loader_.GetVersion(&cros_consumer_, + cros_version_loader_.GetVersion(chromeos::VersionLoader::VERSION_FULL, base::Bind(&ChromeOSVersionCallback), - chromeos::VersionLoader::VERSION_FULL); + &tracker_); #else // Needs to be called after we have chrome::DIR_USER_DATA and // g_browser_process. This happens in PreCreateThreads. -- cgit v1.1