Center static icon

chrome/browser/android/compositor/layer/contextual_search_layer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/compositor/layer/contextual_search_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
@@ skipping 11 matching lines @@
 
 const SkColor kSearchBackgroundColor = SkColorSetRGB(0xee, 0xee, 0xee);
 const SkColor kSearchBarBackgroundColor = SkColorSetRGB(0xff, 0xff, 0xff);
 const SkColor kSearchBarBorderColor = SkColorSetRGB(0xf1, 0xf1, 0xf1);
 const SkColor kPeekPromoRippleBackgroundColor = SkColorSetRGB(0x42, 0x85, 0xF4);
 
 // The alpha blend used in the Peek Promo Background in order to achieve
 // a lighter shade of the color of the Peek Promo Ripple.
 const SkAlpha kPeekPromoBackgroundMaximumAlphaBlend = 0.25f * 255;
 
+// This is the default width for any icon displayed on an OverlayPanel.
+const float kDefaultIconWidthDp = 36.0f;
+
 }  // namespace
 
 namespace chrome {
 namespace android {
 
 // static
 scoped_refptr<ContextualSearchLayer> ContextualSearchLayer::Create(
     ui::ResourceManager* resource_manager) {
   return make_scoped_refptr(new ContextualSearchLayer(resource_manager));
 }
 
 void ContextualSearchLayer::SetProperties(
     int panel_shadow_resource_id,
     int search_context_resource_id,
     int search_term_resource_id,
     int search_bar_shadow_resource_id,
     int panel_icon_resource_id,
     int arrow_up_resource_id,
     int close_icon_resource_id,
     int progress_bar_background_resource_id,
     int progress_bar_resource_id,
     int search_promo_resource_id,
     int peek_promo_ripple_resource_id,
     int peek_promo_text_resource_id,
     int search_provider_icon_sprite_bitmap_resource_id,
     int search_provider_icon_sprite_metadata_resource_id,
+    float dp_to_px,
     content::ContentViewCore* content_view_core,
     bool search_promo_visible,
     float search_promo_height,
     float search_promo_opacity,
     bool search_peek_promo_visible,
     float search_peek_promo_height,
     float search_peek_promo_padding,
     float search_peek_promo_ripple_width,
     float search_peek_promo_ripple_opacity,
     float search_peek_promo_text_opacity,
@@ skipping 197 matching lines @@
   // ---------------------------------------------------------------------------
   if (should_use_static_icon) {
     if (panel_icon_->parent() != layer_) {
       layer_->AddChild(panel_icon_);
     }
     ui::ResourceManager::Resource* panel_icon_resource =
         resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                        panel_icon_resource_id);
     DCHECK(panel_icon_resource);
 
+    // If the icon is not the default width, add or remove padding so it appears
+    // centered.
+    float icon_padding = (kDefaultIconWidthDp * dp_to_px -
+        panel_icon_resource->size.width()) / 2.0f;
+
     // Positions the Icon at the start of the Search Bar.
     float search_provider_icon_left;
     if (is_rtl) {
       search_provider_icon_left = search_panel_width -
-          panel_icon_resource->size.width() - search_bar_margin_side;
+          panel_icon_resource->size.width() -
+          (search_bar_margin_side + icon_padding);
     } else {
-      search_provider_icon_left = search_bar_margin_side;
+      search_provider_icon_left = search_bar_margin_side + icon_padding;
     }
 
     // Centers the Icon vertically in the Search Bar.
     float search_provider_icon_top = search_bar_top +
         search_bar_height / 2 -
         panel_icon_resource->size.height() / 2;
 
     panel_icon_->SetUIResourceId(
         panel_icon_resource->ui_resource->id());
     panel_icon_->SetBounds(panel_icon_resource->size);
@@ skipping 370 matching lines @@
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 scoped_refptr<cc::Layer> ContextualSearchLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android
 }  //  namespace chrome