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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.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 CHROME_BROWSER_UI_COCOA_LOCATION_BAR_SELECTED_KEYWORD_DECORATION_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_SELECTED_KEYWORD_DECORATION_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_SELECTED_KEYWORD_DECORATION_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_SELECTED_KEYWORD_DECORATION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
(...skipping 15 matching lines...) Expand all
26 // return the resulting width. 26 // return the resulting width.
27 virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; 27 virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
28 28
29 void SetImage(NSImage* image); 29 void SetImage(NSImage* image);
30 30
31 private: 31 private:
32 friend class SelectedKeywordDecorationTest; 32 friend class SelectedKeywordDecorationTest;
33 FRIEND_TEST_ALL_PREFIXES(SelectedKeywordDecorationTest, 33 FRIEND_TEST_ALL_PREFIXES(SelectedKeywordDecorationTest,
34 UsesPartialKeywordIfNarrow); 34 UsesPartialKeywordIfNarrow);
35 35
36 scoped_nsobject<NSImage> search_image_; 36 base::scoped_nsobject<NSImage> search_image_;
37 scoped_nsobject<NSString> full_string_; 37 base::scoped_nsobject<NSString> full_string_;
38 scoped_nsobject<NSString> partial_string_; 38 base::scoped_nsobject<NSString> partial_string_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(SelectedKeywordDecoration); 40 DISALLOW_COPY_AND_ASSIGN(SelectedKeywordDecoration);
41 }; 41 };
42 42
43 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_SELECTED_KEYWORD_DECORATION_H_ 43 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_SELECTED_KEYWORD_DECORATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698