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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/bubble_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_BUBBLE_DECORATION_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUBBLE_DECORATION_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUBBLE_DECORATION_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUBBLE_DECORATION_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" 12 #include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
13 13
14 // Draws an outlined rounded rect, with an optional image to the left 14 // Draws an outlined rounded rect, with an optional image to the left
15 // and an optional text label to the right. 15 // and an optional text label to the right.
16 16
17 class BubbleDecoration : public LocationBarDecoration { 17 class BubbleDecoration : public LocationBarDecoration {
18 public: 18 public:
19 BubbleDecoration(); 19 BubbleDecoration();
20 virtual ~BubbleDecoration(); 20 virtual ~BubbleDecoration();
21 21
(...skipping 17 matching lines...) Expand all
39 // Helper to return where the image is drawn, for subclasses to drag 39 // Helper to return where the image is drawn, for subclasses to drag
40 // from. |frame| is the decoration's frame in the containing cell. 40 // from. |frame| is the decoration's frame in the containing cell.
41 NSRect GetImageRectInFrame(NSRect frame); 41 NSRect GetImageRectInFrame(NSRect frame);
42 42
43 private: 43 private:
44 friend class SelectedKeywordDecorationTest; 44 friend class SelectedKeywordDecorationTest;
45 FRIEND_TEST_ALL_PREFIXES(SelectedKeywordDecorationTest, 45 FRIEND_TEST_ALL_PREFIXES(SelectedKeywordDecorationTest,
46 UsesPartialKeywordIfNarrow); 46 UsesPartialKeywordIfNarrow);
47 47
48 // Image drawn in the left side of the bubble. 48 // Image drawn in the left side of the bubble.
49 scoped_nsobject<NSImage> image_; 49 base::scoped_nsobject<NSImage> image_;
50 50
51 // Label to draw to right of image. Can be |nil|. 51 // Label to draw to right of image. Can be |nil|.
52 scoped_nsobject<NSString> label_; 52 base::scoped_nsobject<NSString> label_;
53 53
54 // Contains attribute for drawing |label_|. 54 // Contains attribute for drawing |label_|.
55 scoped_nsobject<NSMutableDictionary> attributes_; 55 base::scoped_nsobject<NSMutableDictionary> attributes_;
56 56
57 // Colors used to draw the bubble, should be set by the subclass 57 // Colors used to draw the bubble, should be set by the subclass
58 // constructor. 58 // constructor.
59 scoped_nsobject<NSColor> background_color_; 59 base::scoped_nsobject<NSColor> background_color_;
60 scoped_nsobject<NSColor> border_color_; 60 base::scoped_nsobject<NSColor> border_color_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(BubbleDecoration); 62 DISALLOW_COPY_AND_ASSIGN(BubbleDecoration);
63 }; 63 };
64 64
65 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUBBLE_DECORATION_H_ 65 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_BUBBLE_DECORATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698