Harmony - fix border for OIB.

ui/views/bubble/bubble_dialog_delegate.cc

Index: ui/views/bubble/bubble_dialog_delegate.cc
diff --git a/ui/views/bubble/bubble_dialog_delegate.cc b/ui/views/bubble/bubble_dialog_delegate.cc
index 60c79a91de2bda24927fe7f4db8e7c9d74b0f57e..149f21363121c25de9f410a06c614de47f48176f 100644
--- a/ui/views/bubble/bubble_dialog_delegate.cc
+++ b/ui/views/bubble/bubble_dialog_delegate.cc
@@ -6,6 +6,7 @@
 
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
@@ -294,7 +295,11 @@ void BubbleDialogDelegateView::UpdateColorsFromTheme(
     const ui::NativeTheme* theme) {
   if (!color_explicitly_set_)
     color_ = theme->GetSystemColor(ui::NativeTheme::kColorId_BubbleBackground);
-  set_background(Background::CreateSolidBackground(color()));
+  // The background color is handled by the BubbleFrameView, so it shouldn't be
+  // necessary to set the color on |this|. I am cowardly leaving it in place for
+  // pre-MD bubbles in case this is necessary for some reason.
+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial())
+    set_background(Background::CreateSolidBackground(color()));
   BubbleFrameView* frame_view = GetBubbleFrameView();
   if (frame_view)
     frame_view->bubble_border()->set_background_color(color());