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

Side by Side Diff: chrome/browser/ui/gtk/status_bubble_gtk.h

Issue 7686015: ui: Pass the parameter |languages| of StatusBubble::SetURL() as std::string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 4 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_GTK_STATUS_BUBBLE_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_STATUS_BUBBLE_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_STATUS_BUBBLE_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_STATUS_BUBBLE_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 25 matching lines...) Expand all
36 public NotificationObserver, 36 public NotificationObserver,
37 public ui::AnimationDelegate { 37 public ui::AnimationDelegate {
38 public: 38 public:
39 explicit StatusBubbleGtk(Profile* profile); 39 explicit StatusBubbleGtk(Profile* profile);
40 virtual ~StatusBubbleGtk(); 40 virtual ~StatusBubbleGtk();
41 41
42 bool flip_horizontally() const { return flip_horizontally_; } 42 bool flip_horizontally() const { return flip_horizontally_; }
43 int y_offset() const { return y_offset_; } 43 int y_offset() const { return y_offset_; }
44 44
45 // StatusBubble implementation. 45 // StatusBubble implementation.
46 virtual void SetStatus(const string16& status); 46 virtual void SetStatus(const string16& status);
tony 2011/08/22 16:31:02 While you're here, can you add OVERRIDE to these v
tfarina 2011/08/22 17:08:25 Done.
47 virtual void SetURL(const GURL& url, const string16& languages); 47 virtual void SetURL(const GURL& url, const std::string& languages);
48 virtual void Hide(); 48 virtual void Hide();
49 virtual void MouseMoved(const gfx::Point& location, bool left_content); 49 virtual void MouseMoved(const gfx::Point& location, bool left_content);
50 50
51 // ui::AnimationDelegate implementation. 51 // ui::AnimationDelegate implementation.
52 virtual void AnimationEnded(const ui::Animation* animation); 52 virtual void AnimationEnded(const ui::Animation* animation);
53 virtual void AnimationProgressed(const ui::Animation* animation); 53 virtual void AnimationProgressed(const ui::Animation* animation);
54 54
55 // Called when the download shelf becomes visible or invisible. 55 // Called when the download shelf becomes visible or invisible.
56 // This is used by to ensure that the status bubble does not obscure 56 // This is used by to ensure that the status bubble does not obscure
57 // the download shelf, when it is visible. 57 // the download shelf, when it is visible.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 std::string status_text_; 129 std::string status_text_;
130 130
131 // The URL we are displaying for. 131 // The URL we are displaying for.
132 GURL url_; 132 GURL url_;
133 133
134 // The possibly elided url text we want to display. 134 // The possibly elided url text we want to display.
135 std::string url_text_; 135 std::string url_text_;
136 136
137 // Used to determine the character set that the user can read (for eliding 137 // Used to determine the character set that the user can read (for eliding
138 // the url text). 138 // the url text).
139 string16 languages_; 139 std::string languages_;
140 140
141 // A timer that hides our window after a delay. 141 // A timer that hides our window after a delay.
142 base::OneShotTimer<StatusBubbleGtk> hide_timer_; 142 base::OneShotTimer<StatusBubbleGtk> hide_timer_;
143 143
144 // A timer that expands our window after a delay. 144 // A timer that expands our window after a delay.
145 base::OneShotTimer<StatusBubbleGtk> expand_timer_; 145 base::OneShotTimer<StatusBubbleGtk> expand_timer_;
146 146
147 // The animation for resizing the status bubble on long hovers. 147 // The animation for resizing the status bubble on long hovers.
148 scoped_ptr<ui::SlideAnimation> expand_animation_; 148 scoped_ptr<ui::SlideAnimation> expand_animation_;
149 149
(...skipping 17 matching lines...) Expand all
167 // when its text changes, triggering a size change. 167 // when its text changes, triggering a size change.
168 gfx::Point last_mouse_location_; 168 gfx::Point last_mouse_location_;
169 bool last_mouse_left_content_; 169 bool last_mouse_left_content_;
170 170
171 // Shortly after the cursor enters the status bubble, we'll get a message 171 // Shortly after the cursor enters the status bubble, we'll get a message
172 // that the cursor left the content area. This lets us ignore that. 172 // that the cursor left the content area. This lets us ignore that.
173 bool ignore_next_left_content_; 173 bool ignore_next_left_content_;
174 }; 174 };
175 175
176 #endif // CHROME_BROWSER_UI_GTK_STATUS_BUBBLE_GTK_H_ 176 #endif // CHROME_BROWSER_UI_GTK_STATUS_BUBBLE_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698