diff options
| author | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 00:10:38 +0000 |
|---|---|---|
| committer | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 00:10:38 +0000 |
| commit | a33747b58ef3bab43d62cd17082d7f699fb71914 (patch) | |
| tree | 1a7179fe6f03ce6bdb1f69db69258ec09ba5251e /chrome/browser/chrome_browser_main_linux.cc | |
| parent | 7942a47132cadc0893d7684df49a878a0516124d (diff) | |
| download | chromium_src-a33747b58ef3bab43d62cd17082d7f699fb71914.zip chromium_src-a33747b58ef3bab43d62cd17082d7f699fb71914.tar.gz chromium_src-a33747b58ef3bab43d62cd17082d7f699fb71914.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/chrome_browser_main_linux.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_linux.cc | 9 |
1 files changed, 4 insertions, 5 deletions
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. |