Material Page Info (Views, 3/3): Update site settings section.

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"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"

[msw, 2016/10/08 00:21:57]

nit: remove

 #include "chrome/browser/ui/views/website_settings/chosen_object_row_observer.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_row_observer.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "components/security_state/security_state_model.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label_listener.h"
@@ skipping 19 matching lines @@
 class Label;
 class LabelButton;
 class Link;
 class Widget;
 }
 
 enum : int {
   // Left icon margin.
   kPermissionIconMarginLeft = 6,
   // The width of the column that contains the permissions icons.
-  kPermissionIconColumnWidth = 20,
+  kPermissionIconColumnWidth = 16,
 };
 
 // The views implementation of the website settings UI.
 class WebsiteSettingsPopupView : public content::WebContentsObserver,
                                  public PermissionSelectorRowObserver,
                                  public ChosenObjectRowObserver,
                                  public views::BubbleDialogDelegateView,
                                  public views::ButtonListener,
                                  public views::LinkListener,
                                  public views::StyledLabelListener,
@@ skipping 59 matching lines @@
       const PermissionInfoList& permission_info_list,
       const ChosenObjectInfoList& chosen_object_info_list) override;
   void SetIdentityInfo(const IdentityInfo& identity_info) override;
   // TODO(lgarron): Remove SetSelectedTab() with https://crbug.com/571533
   void SetSelectedTab(TabId tab_id) 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;
 
-  // The site settings view contains several sections with a |headline|
-  // followed by the section |contents| and an optional |link|. This method
-  // creates a section for the given |headline|, |contents| and |link|. |link|
-  // can be NULL if the section should not contain a link.
-  views::View* CreateSection(const base::string16& headline,
-                             views::View* contents,
-                             views::Link* link) 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.
   std::unique_ptr<WebsiteSettings> presenter_;
 
   // The header section (containing security-related information).
   PopupHeaderView* header_;
 
   // The separator between the header and the site settings view.
   views::Separator* separator_;
 
-  // The view that contains the site data and permissions sections.
+  // The view that contains the cookie and permissions sections.
   views::View* site_settings_view_;
-  // The view that contains the contents of the "Cookies and Site data" section
-  // of the site settings view.
-  views::View* site_data_content_;
+  // The view that contains the contents of the "Cookies" part of the site
+  // settings view.
+  views::View* cookies_view_;
   // The link that opens the "Cookies" dialog.
   views::Link* cookie_dialog_link_;
-  // The view that contains the contents of the "Permissions" section
-  // of the site settings view.
-  views::View* permissions_content_;
+  // The view that contains the "Permissions" table of the site settings view.
+  views::View* permissions_view_;
 
   // The certificate provided by the site, if one exists.
   scoped_refptr<net::X509Certificate> certificate_;
 
-  // The link to open the site settings page that provides full control over
-  // the origin's permissions.
-  views::Link* site_settings_link_;
-
   base::WeakPtrFactory<WebsiteSettingsPopupView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_