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

Unified Diff: chrome_frame/dll_redirector.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
« no previous file with comments | « chrome/installer/util/installer_state.h ('k') | webkit/plugins/npapi/plugin_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/dll_redirector.h
diff --git a/chrome_frame/dll_redirector.h b/chrome_frame/dll_redirector.h
index ee6d94216cd26b90a4558a92273a409d29844d91..81c882bd7d203260cbb3407c09f1f7ec6489ceb5 100644
--- a/chrome_frame/dll_redirector.h
+++ b/chrome_frame/dll_redirector.h
@@ -18,7 +18,10 @@
namespace ATL {
class CSecurityAttributes;
}
+
+namespace base {
class Version;
+}
// A singleton class that provides a facility to register the version of the
// current module as the only version that should be loaded system-wide. If
@@ -69,14 +72,14 @@ class DllRedirector {
virtual HMODULE GetFirstModule();
// Returns the version of the current module or NULL if none can be found.
- // The caller must free the Version.
- virtual Version* GetCurrentModuleVersion();
+ // The caller must free the returned version.
+ virtual base::Version* GetCurrentModuleVersion();
// Attempt to load the specified version dll. Finds it by walking up one
// directory from our current module's location, then appending the newly
// found version number. The Version class in base will have ensured that we
// actually have a valid version and not e.g. ..\..\..\..\MyEvilFolder\.
- virtual HMODULE LoadVersionedModule(Version* version);
+ virtual HMODULE LoadVersionedModule(base::Version* version);
// Builds the necessary SECURITY_ATTRIBUTES to allow low integrity access
// to an object. Returns true on success, false otherwise.
@@ -91,7 +94,7 @@ class DllRedirector {
scoped_ptr<base::SharedMemory> shared_memory_;
// The current version of the DLL to be loaded.
- scoped_ptr<Version> dll_version_;
+ scoped_ptr<base::Version> dll_version_;
// The handle to the first version of this module that was loaded. This
// may refer to the current module, or another version of the same module
« no previous file with comments | « chrome/installer/util/installer_state.h ('k') | webkit/plugins/npapi/plugin_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698