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

Side by Side Diff: chrome/browser/ui/views/location_bar/icon_label_bubble_view.h

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/string16.h"
12 #include "ui/gfx/size.h" 11 #include "ui/gfx/size.h"
13 #include "views/painter.h" 12 #include "views/painter.h"
14 #include "views/view.h" 13 #include "views/view.h"
15 14
16 namespace gfx { 15 namespace gfx {
17 class Canvas; 16 class Canvas;
18 class Font; 17 class Font;
19 } 18 }
20 namespace views { 19 namespace views {
21 class ImageView; 20 class ImageView;
22 class Label; 21 class Label;
23 } 22 }
24 23
25 class SkBitmap; 24 class SkBitmap;
26 25
27 // View used to draw a bubble to the left of the address, containing an icon and 26 // View used to draw a bubble to the left of the address, containing an icon and
28 // a label. We use this as a base for the classes that handle the EV bubble and 27 // a label. We use this as a base for the classes that handle the EV bubble and
29 // tab-to-search UI. 28 // tab-to-search UI.
30 class IconLabelBubbleView : public views::View { 29 class IconLabelBubbleView : public views::View {
31 public: 30 public:
32 IconLabelBubbleView(const int background_images[], 31 IconLabelBubbleView(const int background_images[],
33 int contained_image, 32 int contained_image,
34 const SkColor& color); 33 const SkColor& color);
35 virtual ~IconLabelBubbleView(); 34 virtual ~IconLabelBubbleView();
36 35
37 void SetFont(const gfx::Font& font); 36 void SetFont(const gfx::Font& font);
38 void SetLabel(const string16& label); 37 void SetLabel(const std::wstring& label);
39 void SetImage(const SkBitmap& bitmap); 38 void SetImage(const SkBitmap& bitmap);
40 void set_is_extension_icon(bool is_extension_icon) { 39 void set_is_extension_icon(bool is_extension_icon) {
41 is_extension_icon_ = is_extension_icon; 40 is_extension_icon_ = is_extension_icon;
42 } 41 }
43 42
44 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 43 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
45 virtual gfx::Size GetPreferredSize() OVERRIDE; 44 virtual gfx::Size GetPreferredSize() OVERRIDE;
46 virtual void Layout() OVERRIDE; 45 virtual void Layout() OVERRIDE;
47 46
48 protected: 47 protected:
(...skipping 10 matching lines...) Expand all
59 // The contents of the bubble. 58 // The contents of the bubble.
60 views::ImageView* image_; 59 views::ImageView* image_;
61 views::Label* label_; 60 views::Label* label_;
62 61
63 bool is_extension_icon_; 62 bool is_extension_icon_;
64 63
65 DISALLOW_IMPLICIT_CONSTRUCTORS(IconLabelBubbleView); 64 DISALLOW_IMPLICIT_CONSTRUCTORS(IconLabelBubbleView);
66 }; 65 };
67 66
68 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ 67 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698