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

Side by Side Diff: base/file_version_info_mac.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef BASE_FILE_VERSION_INFO_MAC_H_ 5 #ifndef BASE_FILE_VERSION_INFO_MAC_H_
6 #define BASE_FILE_VERSION_INFO_MAC_H_ 6 #define BASE_FILE_VERSION_INFO_MAC_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 12
13 #ifdef __OBJC__ 13 #ifdef __OBJC__
14 @class NSBundle; 14 @class NSBundle;
15 #else 15 #else
16 class NSBundle; 16 class NSBundle;
17 #endif 17 #endif
18 18
19 class FileVersionInfoMac : public FileVersionInfo { 19 class FileVersionInfoMac : public FileVersionInfo {
20 public: 20 public:
21 explicit FileVersionInfoMac(NSBundle *bundle); 21 explicit FileVersionInfoMac(NSBundle *bundle);
(...skipping 16 matching lines...) Expand all
38 virtual string16 legal_copyright() OVERRIDE; 38 virtual string16 legal_copyright() OVERRIDE;
39 virtual string16 legal_trademarks() OVERRIDE; 39 virtual string16 legal_trademarks() OVERRIDE;
40 virtual string16 last_change() OVERRIDE; 40 virtual string16 last_change() OVERRIDE;
41 virtual bool is_official_build() OVERRIDE; 41 virtual bool is_official_build() OVERRIDE;
42 42
43 private: 43 private:
44 // Returns a string16 value for a property name. 44 // Returns a string16 value for a property name.
45 // Returns the empty string if the property does not exist. 45 // Returns the empty string if the property does not exist.
46 string16 GetString16Value(CFStringRef name); 46 string16 GetString16Value(CFStringRef name);
47 47
48 scoped_nsobject<NSBundle> bundle_; 48 base::scoped_nsobject<NSBundle> bundle_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(FileVersionInfoMac); 50 DISALLOW_COPY_AND_ASSIGN(FileVersionInfoMac);
51 }; 51 };
52 52
53 #endif // BASE_FILE_VERSION_INFO_MAC_H_ 53 #endif // BASE_FILE_VERSION_INFO_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698