Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3880)

Unified Diff: chrome/browser/component_updater/pnacl/pnacl_component_installer.h

Issue 14099010: Move Version to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/pnacl/pnacl_component_installer.h
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.h b/chrome/browser/component_updater/pnacl/pnacl_component_installer.h
index 5d58402803892213ae2dd5b60f75a060c836e03e..fd143ba52e239c6e5672ab0cbd5ebd5da8bf598d 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.h
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.h
@@ -7,11 +7,11 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
+#include "base/version.h"
#include "chrome/browser/component_updater/component_updater_service.h"
#include "chrome/browser/component_updater/pnacl/pnacl_profile_observer.h"
class CommandLine;
-class Version;
namespace base {
class DictionaryValue;
@@ -47,9 +47,9 @@ class PnaclComponentInstaller : public ComponentInstaller {
// Determine the base directory for storing each version of PNaCl.
base::FilePath GetPnaclBaseDirectory();
- Version current_version() const { return current_version_; }
+ base::Version current_version() const { return current_version_; }
- void set_current_version(const Version& v) { current_version_ = v; }
+ void set_current_version(const base::Version& v) { current_version_ = v; }
ComponentUpdateService* cus() const { return cus_; }
@@ -57,7 +57,7 @@ class PnaclComponentInstaller : public ComponentInstaller {
bool per_user_;
scoped_ptr<PnaclProfileObserver> profile_observer_;
base::FilePath current_profile_path_;
- Version current_version_;
+ base::Version current_version_;
ComponentUpdateService* cus_;
DISALLOW_COPY_AND_ASSIGN(PnaclComponentInstaller);
};
@@ -65,6 +65,6 @@ class PnaclComponentInstaller : public ComponentInstaller {
// Returns true if this browser is compatible with the given Pnacl component
// manifest, with the version specified in the manifest in |version_out|.
bool CheckPnaclComponentManifest(base::DictionaryValue* manifest,
- Version* version_out);
+ base::Version* version_out);
#endif // CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_
« no previous file with comments | « chrome/browser/component_updater/flash_component_installer.h ('k') | chrome/browser/extensions/api/runtime/runtime_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698