[merge-m57] Ensure the line on the origin info bubble extends the full width of the bubble.

chrome/browser/ui/views/website_settings/website_settings_popup_view.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
@@ skipping 117 matching lines @@
   gfx::Size GetPreferredSize() const override;
 
   // WebsiteSettingsUI implementations.
   void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
   void SetPermissionInfo(const PermissionInfoList& permission_info_list,
                          ChosenObjectInfoList chosen_object_info_list) override;
   void SetIdentityInfo(const IdentityInfo& identity_info) override;
 
   // Creates the contents of the |site_settings_view_|. The ownership of the
   // returned view is transferred to the caller.
-  views::View* CreateSiteSettingsView() WARN_UNUSED_RESULT;
+  views::View* CreateSiteSettingsView(int side_margin) WARN_UNUSED_RESULT;
 
   // Used to asynchronously handle clicks since these calls may cause the
   // destruction of the settings view and the base class window still needs to
   // be alive to finish handling the mouse or keyboard click.
   void HandleLinkClickedAsync(views::Link* source);
 
   // Whether DevTools is disabled for the relevant profile.
   bool is_devtools_disabled_;
 
   // The presenter that controls the Website Settings UI.
@@ skipping 22 matching lines @@
 
   // The certificate provided by the site, if one exists.
   scoped_refptr<net::X509Certificate> certificate_;
 
   base::WeakPtrFactory<WebsiteSettingsPopupView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_