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

Unified Diff: base/file_version_info_mac.h

Issue 5815001: Fixed file_version_info so that it finds Mac values correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simplified the change due to problems getting the older patch to work with chrome frame. Created 10 years 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 | « base/file_version_info.h ('k') | base/file_version_info_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/file_version_info_mac.h
diff --git a/base/file_version_info_mac.h b/base/file_version_info_mac.h
index d66c4e6343c7b316eb6263c628d87712c2353b7d..36cb538dde77cfc97271fa16e1ebdf54912ad48e 100644
--- a/base/file_version_info_mac.h
+++ b/base/file_version_info_mac.h
@@ -8,9 +8,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/file_version_info.h"
-#include "base/scoped_ptr.h"
+#include "base/scoped_nsobject.h"
#ifdef __OBJC__
@class NSBundle;
@@ -25,7 +24,6 @@ class NSBundle;
class FileVersionInfoMac : public FileVersionInfo {
public:
explicit FileVersionInfoMac(NSBundle *bundle);
- ~FileVersionInfoMac();
// Accessors to the different version properties.
// Returns an empty string if the property is not found.
@@ -47,14 +45,13 @@ class FileVersionInfoMac : public FileVersionInfo {
virtual bool is_official_build();
private:
- // Lets you access other properties not covered above.
- bool GetValue(const wchar_t* name, std::wstring* value);
- // Similar to GetValue but returns a wstring (empty string if the property
- // does not exist).
- std::wstring GetStringValue(const wchar_t* name);
- NSBundle *bundle_;
+ // Returns a wstring value for a property name.
+ // Returns the empty string if the property does not exist.
+ std::wstring GetWStringValue(CFStringRef name);
+
+ scoped_nsobject<NSBundle> bundle_;
DISALLOW_COPY_AND_ASSIGN(FileVersionInfoMac);
};
« no previous file with comments | « base/file_version_info.h ('k') | base/file_version_info_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698