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

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

Issue 2555623002: Last round of cleaning up MD layout constants. (Closed)
Patch Set: pkasting review, remove debug code, rebase Created 4 years 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 3b5f6cb896e6f4f205757c30f05f926f04fb3895..c914e2cd9d038238a45369e313b42c850bfeb3a5 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
@@ -8,7 +8,6 @@
#include "chrome/browser/themes/theme_properties.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/content_settings/content_setting_image_model.h"
-#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/views/content_setting_bubble_contents.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "chrome/grit/theme_resources.h"
@@ -163,9 +162,8 @@ SkColor ContentSettingImageView::GetTextColor() const {
bool ContentSettingImageView::ShouldShowLabel() const {
return (!IsShrinking() ||
- (width() >
- (image()->GetPreferredSize().width() +
- 2 * GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING)))) &&
+ (width() > (image()->GetPreferredSize().width() +
+ 2 * LocationBarView::kHorizontalPadding))) &&
(slide_animator_.is_animating() || pause_animation_);
}

Powered by Google App Engine
This is Rietveld 408576698