Delete panel metrics and define insets in terms of distance metrics.

chrome/browser/ui/views/extensions/media_gallery_checkbox_view.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/ui/views/extensions/media_gallery_checkbox_view.h"
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 13 matching lines @@
 
 MediaGalleryCheckboxView::MediaGalleryCheckboxView(
     const MediaGalleryPrefInfo& pref_info,
     int trailing_vertical_space,
     views::ButtonListener* button_listener,
     views::ContextMenuController* menu_controller) {
   DCHECK(button_listener != NULL);
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
-  const int border_horiz_margin =
-      provider->GetDistanceMetric(DISTANCE_PANEL_CONTENT_MARGIN);
+  const int border_horiz_margin = provider->GetDistanceMetric(
+      views::DISTANCE_BUBBLE_CONTENTS_HORIZONTAL_MARGIN);
   SetBorder(views::CreateEmptyBorder(
       0, border_horiz_margin, trailing_vertical_space, border_horiz_margin));
   if (menu_controller)
     set_context_menu_controller(menu_controller);
 
   checkbox_ = new views::Checkbox(pref_info.GetGalleryDisplayName());
   checkbox_->set_listener(button_listener);
   if (menu_controller)
     checkbox_->set_context_menu_controller(menu_controller);
   checkbox_->SetElideBehavior(gfx::ELIDE_MIDDLE);
@@ skipping 38 matching lines @@
         std::max(area.width() / 2, area.width() - checkbox_width);
   }
   checkbox_width = area.width() - secondary_text_width;
 
   checkbox_->SetBounds(area.x(), area.y(), checkbox_width, area.height());
   if (secondary_text_->visible()) {
     secondary_text_->SetBounds(checkbox_->x() + checkbox_width, area.y(),
                                secondary_text_width, area.height());
   }
 }