Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6933)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1686903002: [Abandoned] Rename PermissionBubbleManager to PermissionRequestManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests compile Created 4 years, 8 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
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 fe8c83ef5cc8235e1cb3d251bbbdb321ce54450e..3e6bf88874beacfcddbb506c66b5ca11548797cd 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"
@@ -100,7 +101,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"
@@ -871,11 +871,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();
}
@@ -1557,8 +1557,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
@@ -1575,8 +1575,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
@@ -2343,8 +2343,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 {
« no previous file with comments | « chrome/browser/ui/tab_helpers.cc ('k') | chrome/browser/ui/website_settings/mock_permission_bubble_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698