Refactor SecurityStateModel/Clients for simplicity and reusability.

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 "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"
 
 class GURL;
 class PopupHeaderView;
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class X509Certificate;
 }
 
+namespace security_state {
+struct SecurityInfo;
+}  // namespace security_state
+
 namespace test {
 class WebsiteSettingsPopupViewTestApi;
 }
 
 namespace views {
 class ImageButton;
 class Label;
 class LabelButton;
 class Link;
 class Widget;
@@ skipping 21 matching lines @@
   // Type of the popup being displayed.
   enum PopupType {
     POPUP_NONE,
     // Usual page info bubble for websites.
     POPUP_WEBSITE_SETTINGS,
     // Custom bubble for internal pages like chrome:// and chrome-extensions://.
     POPUP_INTERNAL_PAGE
   };
 
   // If |anchor_view| is null, |anchor_rect| is used to anchor the bubble.
-  static void ShowPopup(
-      views::View* anchor_view,
-      const gfx::Rect& anchor_rect,
-      Profile* profile,
-      content::WebContents* web_contents,
-      const GURL& url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info);
+  static void ShowPopup(views::View* anchor_view,
+                        const gfx::Rect& anchor_rect,
+                        Profile* profile,
+                        content::WebContents* web_contents,
+                        const GURL& url,
+                        const security_state::SecurityInfo& security_info);
 
   // Returns the type of the popup bubble being shown.
   static PopupType GetShownPopupType();
 
  private:
   friend class test::WebsiteSettingsPopupViewTestApi;
 
-  WebsiteSettingsPopupView(
-      views::View* anchor_view,
-      gfx::NativeView parent_window,
-      Profile* profile,
-      content::WebContents* web_contents,
-      const GURL& url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info);
+  WebsiteSettingsPopupView(views::View* anchor_view,
+                           gfx::NativeView parent_window,
+                           Profile* profile,
+                           content::WebContents* web_contents,
+                           const GURL& url,
+                           const security_state::SecurityInfo& security_info);
 
   // WebContentsObserver implementation.
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
   void WebContentsDestroyed() override;
 
   // PermissionSelectorRowObserver implementation.
   void OnPermissionChanged(
       const WebsiteSettingsUI::PermissionInfo& permission) override;
 
   // ChosenObjectRowObserver implementation.
@@ skipping 61 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_