Adjust positioning of website settings popup for Harmony.

chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_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/location_bar/location_bar_bubble_delegate_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
@@ skipping 43 matching lines @@
                                anchor_view ? views::BubbleBorder::TOP_RIGHT
                                            : views::BubbleBorder::NONE) {
   // Add observer to close the bubble if the fullscreen state changes.
   if (web_contents) {
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
     registrar_.Add(
         this, chrome::NOTIFICATION_FULLSCREEN_CHANGED,
         content::Source<FullscreenController>(
             browser->exclusive_access_manager()->fullscreen_controller()));
   }
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
-    // The anchor is the location bar. The bubble's 1px border should overlap
-    // the location bar's 1px border.
-    set_anchor_view_insets(gfx::Insets(0, 0, 1, 0));
-  } else {
-    // Compensate for built-in vertical padding in the anchor view's image.
-    set_anchor_view_insets(gfx::Insets(
-        GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
-  }
+  // Compensate for built-in vertical padding in the anchor view's image.
+  // In the case of Harmony, this is just compensating for the location bar's
+  // border thickness, as the bubble's top border should overlap it.
+  set_anchor_view_insets(gfx::Insets(
+      GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 }
 
 LocationBarBubbleDelegateView::~LocationBarBubbleDelegateView() {}
 
 void LocationBarBubbleDelegateView::ShowForReason(DisplayReason reason) {
   if (reason == USER_GESTURE) {
     // In the USER_GESTURE case, the icon will be in an active state so the
     // bubble doesn't need an arrow.
     SetArrowPaintType(views::BubbleBorder::PAINT_TRANSPARENT);
     GetWidget()->Show();
@@ skipping 24 matching lines @@
   if (GetAnchorView())
     return;
 
   const int kBubblePaddingFromScreenEdge = 20;
   int horizontal_offset = width() / 2 + kBubblePaddingFromScreenEdge;
   const int x_pos = base::i18n::IsRTL()
                         ? (screen_bounds.x() + horizontal_offset)
                         : (screen_bounds.right() - horizontal_offset);
   SetAnchorRect(gfx::Rect(x_pos, screen_bounds.y(), 0, 0));
 }