| Index: chrome/browser/ui/views/conflicting_module_view_win.cc
|
| diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc
|
| index a8de5510836e4a253c1f247bd87fc22d183e2899..8d1378d505a9cae485be1b9b98c13ec42fb347d4 100644
|
| --- a/chrome/browser/ui/views/conflicting_module_view_win.cc
|
| +++ b/chrome/browser/ui/views/conflicting_module_view_win.cc
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_dialogs.h"
|
| #include "chrome/browser/ui/layout_constants.h"
|
| +#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "chrome/grit/generated_resources.h"
|
| @@ -24,7 +25,6 @@
|
| #include "ui/views/controls/image_view.h"
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/layout/box_layout.h"
|
| -#include "ui/views/layout/layout_constants.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| using base::UserMetricsAction;
|
| @@ -138,7 +138,8 @@ void ConflictingModuleView::Init() {
|
|
|
| SetLayoutManager(
|
| new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
|
| - views::kRelatedControlHorizontalSpacing));
|
| + ChromeLayoutProvider::Get()->GetDistanceMetric(
|
| + DISTANCE_RELATED_LABEL_HORIZONTAL)));
|
|
|
| views::ImageView* icon = new views::ImageView();
|
| icon->SetImage(rb.GetImageSkiaNamed(IDR_INPUT_ALERT_MENU));
|
|
|