Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.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"
 
+class Profile;
 class WebsiteSettingsUIBridge;
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class X509Certificate;
 }
 
 // This NSWindowController subclass manages the InfoBubbleWindow and view that
 // are displayed when the user clicks the favicon or security lock icon.
 //
 // TODO(palmer): Normalize all WebsiteSettings*, SiteSettings*, PageInfo*, et c.
 // to OriginInfo*.
 @interface WebsiteSettingsBubbleController : BaseBubbleController {
  @private
   content::WebContents* webContents_;
 
+  Profile* profile_;
+

[groby-ooo-7-16, 2016/10/10 05:50:07]

nit: kill the blank lines

[raymes, 2016/10/10 06:02:17]

Done.

   base::scoped_nsobject<NSView> contentView_;
 
   // The main content view for the Permissions tab.
   NSView* securitySectionView_;
 
   // Displays the short security summary for the page
   // (private/not private/etc.).
   NSTextField* securitySummaryField_;
 
   // Displays a longer explanation of the page's security state, and how the
@@ skipping 51 matching lines @@
   // methods on to this class.
   std::unique_ptr<WebsiteSettingsUIBridge> bridge_;
 }
 
 // Designated initializer. The controller will release itself when the bubble
 // is closed. |parentWindow| cannot be nil. |webContents| may be nil for
 // testing purposes.
 - (id)initWithParentWindow:(NSWindow*)parentWindow
     websiteSettingsUIBridge:(WebsiteSettingsUIBridge*)bridge
                 webContents:(content::WebContents*)webContents
+                 forProfile:(Profile*)profile

[groby-ooo-7-16, 2016/10/10 05:50:07]

nit: forProfile

[raymes, 2016/10/10 06:02:17]

Done.

                         url:(const GURL&)url
          isDevToolsDisabled:(BOOL)isDevToolsDisabled;
 
 // Return the default width of the window. It may be wider to fit the content.
 // This may be overriden by a subclass for testing purposes.
 - (CGFloat)defaultWindowWidth;
 
 @end
 
 // Provides a bridge between the WebSettingsUI C++ interface and the Cocoa
@@ skipping 34 matching lines @@
 
  private:
   // The WebContents the bubble UI is attached to.
   content::WebContents* web_contents_;
 
   // The Cocoa controller for the bubble UI.
   WebsiteSettingsBubbleController* bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsUIBridge);
 };