| Index: chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_view_cocoa_views.mm b/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
|
| similarity index 71%
|
| rename from chrome/browser/ui/cocoa/website_settings/permission_bubble_view_cocoa_views.mm
|
| rename to chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
|
| index 590b9039e7db8eb1b965771d58b4755c1cb1291d..91311bd1d066d3c0b6ad20022986d49fd00a025a 100644
|
| --- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_view_cocoa_views.mm
|
| +++ b/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm
|
| @@ -7,36 +7,35 @@
|
| #include "chrome/browser/ui/browser_dialogs.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #import "chrome/browser/ui/cocoa/browser_window_controller.h"
|
| +#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
|
| #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
|
| #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
|
| -#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
|
| -#include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
|
| +#include "chrome/browser/ui/views/website_settings/permission_prompt_impl.h"
|
| #import "ui/base/cocoa/cocoa_base_utils.h"
|
| #import "ui/gfx/mac/coordinate_conversion.h"
|
|
|
| -// Implementation of PermissionBubbleViewViews' anchor methods for Cocoa
|
| +// Implementation of PermissionPromptImpl's anchor methods for Cocoa
|
| // browsers. In Cocoa browsers there is no parent views::View for the permission
|
| // bubble, so these methods supply an anchor point instead.
|
|
|
| -views::View* PermissionBubbleViewViews::GetAnchorView() {
|
| +views::View* PermissionPromptImpl::GetAnchorView() {
|
| return nullptr;
|
| }
|
|
|
| -gfx::Point PermissionBubbleViewViews::GetAnchorPoint() {
|
| +gfx::Point PermissionPromptImpl::GetAnchorPoint() {
|
| return gfx::ScreenPointFromNSPoint(
|
| [PermissionBubbleController getAnchorPointForBrowser:browser_]);
|
| }
|
|
|
| -views::BubbleBorder::Arrow PermissionBubbleViewViews::GetAnchorArrow() {
|
| +views::BubbleBorder::Arrow PermissionPromptImpl::GetAnchorArrow() {
|
| return [PermissionBubbleController hasVisibleLocationBarForBrowser:browser_]
|
| ? views::BubbleBorder::TOP_LEFT
|
| : views::BubbleBorder::NONE;
|
| }
|
|
|
| // static
|
| -std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(
|
| - Browser* browser) {
|
| +std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(Browser* browser) {
|
| if (chrome::ToolkitViewsWebUIDialogsEnabled())
|
| - return base::WrapUnique(new PermissionBubbleViewViews(browser));
|
| + return base::WrapUnique(new PermissionPromptImpl(browser));
|
| return base::WrapUnique(new PermissionBubbleCocoa(browser));
|
| }
|
|
|