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

Side by Side Diff: chrome/browser/ui/views/status_bubble_views.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_VIEWS_STATUS_BUBBLE_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // the font and kTotalVerticalPadding. 48 // the font and kTotalVerticalPadding.
49 gfx::Size GetPreferredSize(); 49 gfx::Size GetPreferredSize();
50 50
51 // Set the bounds of the bubble relative to |base_view_|. 51 // Set the bounds of the bubble relative to |base_view_|.
52 void SetBounds(int x, int y, int w, int h); 52 void SetBounds(int x, int y, int w, int h);
53 53
54 // Set bubble to new width. 54 // Set bubble to new width.
55 void SetBubbleWidth(int width); 55 void SetBubbleWidth(int width);
56 56
57 // Overridden from StatusBubble: 57 // Overridden from StatusBubble:
58 virtual void SetStatus(const string16& status); 58 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.
59 virtual void SetURL(const GURL& url, const string16& languages); 59 virtual void SetURL(const GURL& url, const std::string& languages);
60 virtual void Hide(); 60 virtual void Hide();
61 virtual void MouseMoved(const gfx::Point& location, bool left_content); 61 virtual void MouseMoved(const gfx::Point& location, bool left_content);
62 virtual void UpdateDownloadShelfVisibility(bool visible); 62 virtual void UpdateDownloadShelfVisibility(bool visible);
63 63
64 private: 64 private:
65 class StatusView; 65 class StatusView;
66 class StatusViewExpander; 66 class StatusViewExpander;
67 67
68 // Initializes the popup and view. 68 // Initializes the popup and view.
69 void Init(); 69 void Init();
(...skipping 21 matching lines...) Expand all
91 // The status text we want to display when there are no URLs to display. 91 // The status text we want to display when there are no URLs to display.
92 string16 status_text_; 92 string16 status_text_;
93 93
94 // The url we want to display when there is no status text to display. 94 // The url we want to display when there is no status text to display.
95 string16 url_text_; 95 string16 url_text_;
96 96
97 // The original, non-elided URL. 97 // The original, non-elided URL.
98 GURL url_; 98 GURL url_;
99 99
100 // Used to elide the original URL again when we expand it. 100 // Used to elide the original URL again when we expand it.
101 string16 languages_; 101 std::string languages_;
102 102
103 // Position relative to the base_view_. 103 // Position relative to the base_view_.
104 gfx::Point original_position_; 104 gfx::Point original_position_;
105 // original_position_ adjusted according to the current RTL. 105 // original_position_ adjusted according to the current RTL.
106 gfx::Point position_; 106 gfx::Point position_;
107 gfx::Size size_; 107 gfx::Size size_;
108 108
109 // How vertically offset the bubble is from its root position_. 109 // How vertically offset the bubble is from its root position_.
110 int offset_; 110 int offset_;
111 111
(...skipping 15 matching lines...) Expand all
127 // change size immediately, with no hover. 127 // change size immediately, with no hover.
128 bool is_expanded_; 128 bool is_expanded_;
129 129
130 // Times expansion of status bubble when URL is too long for standard width. 130 // Times expansion of status bubble when URL is too long for standard width.
131 ScopedRunnableMethodFactory<StatusBubbleViews> expand_timer_factory_; 131 ScopedRunnableMethodFactory<StatusBubbleViews> expand_timer_factory_;
132 132
133 DISALLOW_COPY_AND_ASSIGN(StatusBubbleViews); 133 DISALLOW_COPY_AND_ASSIGN(StatusBubbleViews);
134 }; 134 };
135 135
136 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_ 136 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698