chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm - Issue 2182883002: Permissions: Rename PermissionBubbleView to PermissionPromptInterface

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

Issue 2182883002: Permissions: Rename PermissionBubbleView to PermissionPromptInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: thestig@ review Created 4 years, 4 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/ui/cocoa/website_settings/permission_bubble_controller.h ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm » ('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 7b896fa694adf6722928bcfad3045e56bf6c8091..d9908715febc7856d23c78e330f52e9d8d320202 100644

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

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

@@ -29,8 +29,8 @@

#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"

#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"

#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"

-#include "chrome/browser/ui/website_settings/permission_bubble_view.h"

#include "chrome/browser/ui/website_settings/permission_menu_model.h"

+#include "chrome/browser/ui/website_settings/permission_prompt.h"

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

#include "components/prefs/pref_service.h"

@@ -79,7 +79,7 @@ const NSSize kPermissionIconSize = {18, 18};

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

allowed:(BOOL)allow

index:(int)index

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

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

// Returns the maximum width of its possible titles.

- (CGFloat)maximumTitleWidth;

@@ -90,14 +90,14 @@ const NSSize kPermissionIconSize = {18, 18};

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

allowed:(BOOL)allow

index:(int)index

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

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

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

ContentSetting setting =

allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;

[self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];

[self setBordered:NO];

- __block PermissionBubbleView::Delegate* blockDelegate = delegate;

+ __block PermissionPrompt::Delegate* blockDelegate = delegate;

__block AllowBlockMenuButton* blockSelf = self;

PermissionMenuModel::ChangeCallback changeCallback =

base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {

@@ -309,7 +309,7 @@ const NSSize kPermissionIconSize = {18, 18};

[self setAnchorPoint:[self getExpectedAnchorPoint]];

}

-- (void)showWithDelegate:(PermissionBubbleView::Delegate*)delegate

+- (void)showWithDelegate:(PermissionPrompt::Delegate*)delegate

forRequests:(const std::vector<PermissionRequest*>&)requests

acceptStates:(const std::vector<bool>&)acceptStates {

DCHECK(!requests.empty());