chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm - Issue 2408613002: Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

Issue 2408613002: Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi… (Closed)

Patch Set: Replace remaining kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi… Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/plugins/plugins_field_trial.cc ('k') | chrome/browser/ui/cocoa/website_settings/permission_selector_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

index bc593c1bfb61cda12898ea55b013bb008f06be50..ddae36cdb4409d561f155c531df945bc584a083d 100644

--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

@@ -84,7 +84,8 @@ const NSInteger kFullscreenLeftOffset = 40;

- (id)initForURL:(const GURL&)url

allowed:(BOOL)allow

index:(int)index

- delegate:(PermissionPrompt::Delegate*)delegate;

+ delegate:(PermissionPrompt::Delegate*)delegate

+ profile:(Profile*)profile;

// Returns the maximum width of its possible titles.

- (CGFloat)maximumTitleWidth;

@@ -95,7 +96,8 @@ const NSInteger kFullscreenLeftOffset = 40;

- (id)initForURL:(const GURL&)url

allowed:(BOOL)allow

index:(int)index

- delegate:(PermissionPrompt::Delegate*)delegate {

+ delegate:(PermissionPrompt::Delegate*)delegate

+ profile:(Profile*)profile {

if (self = [super initWithFrame:NSZeroRect pullsDown:NO]) {

ContentSetting setting =

allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;

@@ -113,7 +115,8 @@ const NSInteger kFullscreenLeftOffset = 40;

[blockSelf title])];

});

- menuModel_.reset(new PermissionMenuModel(url, setting, changeCallback));

+ menuModel_.reset(

+ new PermissionMenuModel(profile, url, setting, changeCallback));

menuController_.reset([[MenuController alloc] initWithModel:menuModel_.get()

useWithPopUpButtonCell:NO]);

[self setMenu:[menuController_ menu]];

@@ -579,7 +582,8 @@ const NSInteger kFullscreenLeftOffset = 40;

[[AllowBlockMenuButton alloc] initForURL:request->GetOrigin()

allowed:allow

index:index

- delegate:delegate_]);

+ delegate:delegate_

+ profile:browser_->profile()]);

return button.autorelease();

}