diff options
author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 07:35:50 +0000 |
---|---|---|
committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 07:35:50 +0000 |
commit | 1f04ef4db936365c0cc1990f1a2b8a7bbbe37653 (patch) | |
tree | 571f9feea8ed976c01a7bd1cf56cee9894d5c005 /chrome_frame | |
parent | 9246e364afd394dd3a7cc2bf838c7ea0b4fc1133 (diff) | |
download | chromium_src-1f04ef4db936365c0cc1990f1a2b8a7bbbe37653.zip chromium_src-1f04ef4db936365c0cc1990f1a2b8a7bbbe37653.tar.gz chromium_src-1f04ef4db936365c0cc1990f1a2b8a7bbbe37653.tar.bz2 |
Move Version to base namespace.
Adds "using base::Version" to the header to avoid having to update everything at
once. All forward declares and the locations where the forward declares are
used are updated.
Review URL: https://chromiumcodereview.appspot.com/14099010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/dll_redirector.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome_frame/dll_redirector.h b/chrome_frame/dll_redirector.h index ee6d942..81c882b 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 |