chrome/browser/ui/views/website_settings/permissions_bubble_view.cc - Issue 2123653006: Rename PermissionBubbleRequest to PermissionRequest

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/views/website_settings/permissions_bubble_view.cc

Issue 2123653006: Rename PermissionBubbleRequest to PermissionRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission_manager_rename

Patch Set: Fix missed file Created 4 years, 5 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/views/website_settings/permissions_bubble_view.h ('k') | chrome/browser/ui/website_settings/mock_permission_bubble_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

index 437964a956e60e266fa9113c80936e45c2a8deda..7239e7b8c59cf4ff6c1e0f14c8c8186698483688 100644

--- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

+++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

@@ -9,6 +9,7 @@

#include "base/macros.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

+#include "chrome/browser/permissions/permission_request.h"

#include "chrome/browser/platform_util.h"

#include "chrome/browser/profiles/profile.h"

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

@@ -16,7 +17,6 @@

#include "chrome/browser/ui/views/exclusive_access_bubble_views.h"

#include "chrome/browser/ui/views/website_settings/permission_selector_view.h"

#include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"

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

#include "chrome/grit/generated_resources.h"

#include "components/url_formatter/elide_url.h"

#include "grit/components_strings.h"

@@ -147,7 +147,7 @@ class PermissionsBubbleDialogDelegateView

public:

PermissionsBubbleDialogDelegateView(

PermissionBubbleViewViews* owner,

- const std::vector<PermissionBubbleRequest*>& requests,

+ const std::vector<PermissionRequest*>& requests,

const std::vector<bool>& accept_state);

~PermissionsBubbleDialogDelegateView() override;

@@ -188,7 +188,7 @@ class PermissionsBubbleDialogDelegateView

PermissionsBubbleDialogDelegateView::PermissionsBubbleDialogDelegateView(

PermissionBubbleViewViews* owner,

- const std::vector<PermissionBubbleRequest*>& requests,

+ const std::vector<PermissionRequest*>& requests,

const std::vector<bool>& accept_state)

: owner_(owner),

multiple_requests_(requests.size() > 1) {

@@ -385,7 +385,7 @@ void PermissionBubbleViewViews::SetDelegate(Delegate* delegate) {

}

void PermissionBubbleViewViews::Show(

- const std::vector<PermissionBubbleRequest*>& requests,

+ const std::vector<PermissionRequest*>& requests,

const std::vector<bool>& values) {

if (bubble_delegate_)

bubble_delegate_->CloseBubble();