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

Unified Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 247193002: Remove touch layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/location_bar/content_setting_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index 3a9a4d5dc91f200994bba957d4ca5948311f59eb..0c898a71079265ef849016bd94dafad98c709884 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -129,7 +129,7 @@ void ContentSettingImageView::Update(content::WebContents* web_contents) {
// static
int ContentSettingImageView::GetBubbleOuterPadding(bool by_icon) {
- return LocationBarView::GetItemPadding() - LocationBarView::kBubblePadding +
+ return LocationBarView::kItemPadding - LocationBarView::kBubblePadding +
(by_icon ? 0 : LocationBarView::kIconInternalPadding);
}
@@ -184,7 +184,7 @@ void ContentSettingImageView::Layout() {
std::min((width() - icon_width) / 2, GetBubbleOuterPadding(true)), 0,
icon_width, height());
text_label_->SetBounds(
- icon_->bounds().right() + LocationBarView::GetItemPadding(), 0,
+ icon_->bounds().right() + LocationBarView::kItemPadding, 0,
std::max(width() - GetTotalSpacingWhileAnimating() - icon_width, 0),
height());
}
@@ -226,7 +226,7 @@ void ContentSettingImageView::OnWidgetDestroying(views::Widget* widget) {
}
int ContentSettingImageView::GetTotalSpacingWhileAnimating() const {
- return GetBubbleOuterPadding(true) + LocationBarView::GetItemPadding() +
+ return GetBubbleOuterPadding(true) + LocationBarView::kItemPadding +
GetBubbleOuterPadding(false);
}

Powered by Google App Engine
This is Rietveld 408576698