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

Unified Diff: chrome/browser/ui/views/status_bubble_views.cc

Issue 10795013: Rename bounds accessors to be intuitive and consistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/status_bubble_views.cc
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 85167cf451314be9bfe4fb31cad745b4015e8259..30bc95f5debf97e91f33fc223613e3ecec8939dc 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -347,7 +347,7 @@ void StatusBubbleViews::StatusView::OnPaint(gfx::Canvas* canvas) {
theme_service_->GetColor(ThemeService::COLOR_TOOLBAR);
paint.setColor(toolbar_color);
- gfx::Rect popup_bounds = popup_->GetWindowScreenBounds();
+ gfx::Rect popup_bounds = popup_->GetWindowBoundsInScreen();
// Figure out how to round the bubble's four corners.
SkScalar rad[8];
@@ -655,7 +655,7 @@ void StatusBubbleViews::SetURL(const GURL& url, const std::string& languages) {
}
// Set Elided Text corresponding to the GURL object.
- gfx::Rect popup_bounds = popup_->GetWindowScreenBounds();
+ gfx::Rect popup_bounds = popup_->GetWindowBoundsInScreen();
int text_width = static_cast<int>(popup_bounds.width() -
(kShadowThickness * 2) - kTextPositionX - kTextHorizPadding - 1);
url_text_ = ui::ElideUrl(url, view_->Label::font(), text_width, languages);
@@ -811,7 +811,7 @@ bool StatusBubbleViews::IsFrameVisible() {
void StatusBubbleViews::ExpandBubble() {
// Elide URL to maximum possible size, then check actual length (it may
// still be too long to fit) before expanding bubble.
- gfx::Rect popup_bounds = popup_->GetWindowScreenBounds();
+ gfx::Rect popup_bounds = popup_->GetWindowBoundsInScreen();
int max_status_bubble_width = GetMaxStatusBubbleWidth();
url_text_ = ui::ElideUrl(url_, view_->Label::font(),
max_status_bubble_width, languages_);
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc ('k') | chrome/browser/ui/views/tabs/dragged_tab_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698