| 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/component_updater/pnacl/pnacl_component_installer.h" | 5 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 // for now). TODO(jvoung): we need notifications if someone surfed to a | 265 // for now). TODO(jvoung): we need notifications if someone surfed to a |
| 266 // Pnacl webpage and Pnacl was just installed at this time. They should | 266 // Pnacl webpage and Pnacl was just installed at this time. They should |
| 267 // then be able to reload the page and retry (or something). | 267 // then be able to reload the page and retry (or something). |
| 268 // See: http://code.google.com/p/chromium/issues/detail?id=107438 | 268 // See: http://code.google.com/p/chromium/issues/detail?id=107438 |
| 269 set_current_version(version); | 269 set_current_version(version); |
| 270 | 270 |
| 271 OverrideDirPnaclComponent(path); | 271 OverrideDirPnaclComponent(path); |
| 272 return true; | 272 return true; |
| 273 } | 273 } |
| 274 | 274 |
| 275 bool PnaclComponentInstaller::GetInstalledFile( |
| 276 const std::string& file, base::FilePath* installed_file) { |
| 277 return false; |
| 278 } |
| 279 |
| 275 namespace { | 280 namespace { |
| 276 | 281 |
| 277 void DoCheckForUpdate(ComponentUpdateService* cus, | 282 void DoCheckForUpdate(ComponentUpdateService* cus, |
| 278 const CrxComponent& pnacl) { | 283 const CrxComponent& pnacl) { |
| 279 if (cus->CheckForUpdateSoon(pnacl) != ComponentUpdateService::kOk) { | 284 if (cus->CheckForUpdateSoon(pnacl) != ComponentUpdateService::kOk) { |
| 280 LOG(WARNING) << "Pnacl check for update failed."; | 285 LOG(WARNING) << "Pnacl check for update failed."; |
| 281 } | 286 } |
| 282 } | 287 } |
| 283 | 288 |
| 284 // Finally, do the registration with the right version number. | 289 // Finally, do the registration with the right version number. |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 // No need to check the commandline flags again here. | 404 // No need to check the commandline flags again here. |
| 400 // We could only have gotten here after RegisterPnaclComponent | 405 // We could only have gotten here after RegisterPnaclComponent |
| 401 // found --enable-pnacl, since that is where we create the profile_observer_, | 406 // found --enable-pnacl, since that is where we create the profile_observer_, |
| 402 // which in turn calls ReRegisterPnacl. | 407 // which in turn calls ReRegisterPnacl. |
| 403 DCHECK(per_user_); | 408 DCHECK(per_user_); |
| 404 // Figure out profile information, before proceeding to look for files. | 409 // Figure out profile information, before proceeding to look for files. |
| 405 BrowserThread::PostTask( | 410 BrowserThread::PostTask( |
| 406 BrowserThread::UI, FROM_HERE, | 411 BrowserThread::UI, FROM_HERE, |
| 407 base::Bind(&GetProfileInformation, this)); | 412 base::Bind(&GetProfileInformation, this)); |
| 408 } | 413 } |
| OLD | NEW |