| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index 5339809471f2b05aeb33fb80c0354ed45c98710c..c79ddc51d2e5d0ea09c4b67e029f767fb9a31f21 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -31,6 +31,7 @@
|
| #include "chrome/browser/extensions/tab_helper.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| #include "chrome/browser/native_window_notification_source.h"
|
| +#include "chrome/browser/permissions/permission_request_manager.h"
|
| #include "chrome/browser/profiles/avatar_menu.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_attributes_entry.h"
|
| @@ -99,7 +100,6 @@
|
| #include "chrome/browser/ui/views/update_recommended_message_box.h"
|
| #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
|
| #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
|
| -#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
|
| #include "chrome/browser/ui/window_sizer/window_sizer.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/command.h"
|
| @@ -844,11 +844,11 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
|
| infobar_container_->ChangeInfoBarManager(
|
| InfoBarService::FromWebContents(new_contents));
|
|
|
| - if (old_contents && PermissionBubbleManager::FromWebContents(old_contents))
|
| - PermissionBubbleManager::FromWebContents(old_contents)->HideBubble();
|
| + if (old_contents && PermissionRequestManager::FromWebContents(old_contents))
|
| + PermissionRequestManager::FromWebContents(old_contents)->HideBubble();
|
|
|
| - if (new_contents && PermissionBubbleManager::FromWebContents(new_contents)) {
|
| - PermissionBubbleManager::FromWebContents(new_contents)
|
| + if (new_contents && PermissionRequestManager::FromWebContents(new_contents)) {
|
| + PermissionRequestManager::FromWebContents(new_contents)
|
| ->DisplayPendingRequests();
|
| }
|
|
|
| @@ -1562,8 +1562,8 @@ void BrowserView::TabInsertedAt(WebContents* contents,
|
| }
|
|
|
| void BrowserView::TabDetachedAt(WebContents* contents, int index) {
|
| - if (PermissionBubbleManager::FromWebContents(contents))
|
| - PermissionBubbleManager::FromWebContents(contents)->HideBubble();
|
| + if (PermissionRequestManager::FromWebContents(contents))
|
| + PermissionRequestManager::FromWebContents(contents)->HideBubble();
|
|
|
| // We use index here rather than comparing |contents| because by this time
|
| // the model has already removed |contents| from its list, so
|
| @@ -1580,8 +1580,8 @@ void BrowserView::TabDetachedAt(WebContents* contents, int index) {
|
| }
|
|
|
| void BrowserView::TabDeactivated(WebContents* contents) {
|
| - if (PermissionBubbleManager::FromWebContents(contents))
|
| - PermissionBubbleManager::FromWebContents(contents)->HideBubble();
|
| + if (PermissionRequestManager::FromWebContents(contents))
|
| + PermissionRequestManager::FromWebContents(contents)->HideBubble();
|
|
|
| // We do not store the focus when closing the tab to work-around bug 4633.
|
| // Some reports seem to show that the focus manager and/or focused view can
|
| @@ -2359,8 +2359,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
| ToolbarSizeChanged(false);
|
|
|
| WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
|
| - if (contents && PermissionBubbleManager::FromWebContents(contents))
|
| - PermissionBubbleManager::FromWebContents(contents)->UpdateAnchorPosition();
|
| + if (contents && PermissionRequestManager::FromWebContents(contents))
|
| + PermissionRequestManager::FromWebContents(contents)->UpdateAnchorPosition();
|
| }
|
|
|
| bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
|
|