| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stdint.h> | 5 #include <stdint.h> |
| 6 #include <string.h> | 6 #include <string.h> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 } | 329 } |
| 330 | 330 |
| 331 } // namespace | 331 } // namespace |
| 332 | 332 |
| 333 class PepperFlashComponentInstaller : public ComponentInstaller { | 333 class PepperFlashComponentInstaller : public ComponentInstaller { |
| 334 public: | 334 public: |
| 335 explicit PepperFlashComponentInstaller(const Version& version); | 335 explicit PepperFlashComponentInstaller(const Version& version); |
| 336 | 336 |
| 337 virtual ~PepperFlashComponentInstaller() {} | 337 virtual ~PepperFlashComponentInstaller() {} |
| 338 | 338 |
| 339 virtual void OnUpdateError(int error) OVERRIDE; | 339 virtual void OnUpdateError(int error) override; |
| 340 | 340 |
| 341 virtual bool Install(const base::DictionaryValue& manifest, | 341 virtual bool Install(const base::DictionaryValue& manifest, |
| 342 const base::FilePath& unpack_path) OVERRIDE; | 342 const base::FilePath& unpack_path) override; |
| 343 | 343 |
| 344 virtual bool GetInstalledFile(const std::string& file, | 344 virtual bool GetInstalledFile(const std::string& file, |
| 345 base::FilePath* installed_file) OVERRIDE; | 345 base::FilePath* installed_file) override; |
| 346 | 346 |
| 347 private: | 347 private: |
| 348 Version current_version_; | 348 Version current_version_; |
| 349 }; | 349 }; |
| 350 | 350 |
| 351 PepperFlashComponentInstaller::PepperFlashComponentInstaller( | 351 PepperFlashComponentInstaller::PepperFlashComponentInstaller( |
| 352 const Version& version) | 352 const Version& version) |
| 353 : current_version_(version) { | 353 : current_version_(version) { |
| 354 DCHECK(version.IsValid()); | 354 DCHECK(version.IsValid()); |
| 355 } | 355 } |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 507 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
| 508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) | 508 if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash)) |
| 509 return; | 509 return; |
| 510 BrowserThread::PostTask(BrowserThread::FILE, | 510 BrowserThread::PostTask(BrowserThread::FILE, |
| 511 FROM_HERE, | 511 FROM_HERE, |
| 512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); | 512 base::Bind(&StartPepperFlashUpdateRegistration, cus)); |
| 513 #endif | 513 #endif |
| 514 } | 514 } |
| 515 | 515 |
| 516 } // namespace component_updater | 516 } // namespace component_updater |
| OLD | NEW |