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

Unified Diff: chrome/browser/ui/website_settings/mock_permission_prompt_factory.cc

Issue 2182883002: Permissions: Rename PermissionBubbleView to PermissionPromptInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Further renames 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
Index: chrome/browser/ui/website_settings/mock_permission_prompt_factory.cc
diff --git a/chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc b/chrome/browser/ui/website_settings/mock_permission_prompt_factory.cc
similarity index 56%
rename from chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc
rename to chrome/browser/ui/website_settings/mock_permission_prompt_factory.cc
index fc135d73137dd0cfbfe94c7e983cd5a2733f9ba9..452ab1d5c64886a8a776fe2f78cb1712dfa75688 100644
--- a/chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc
+++ b/chrome/browser/ui/website_settings/mock_permission_prompt_factory.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h"
+#include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "chrome/browser/permissions/permission_request_manager.h"
-#include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
+#include "chrome/browser/ui/website_settings/mock_permission_prompt.h"
-MockPermissionBubbleFactory::MockPermissionBubbleFactory(
+MockPermissionPromptFactory::MockPermissionPromptFactory(
PermissionRequestManager* manager)
: can_update_ui_(false),
show_count_(0),
@@ -19,43 +19,43 @@ MockPermissionBubbleFactory::MockPermissionBubbleFactory(
response_type_(PermissionRequestManager::NONE),
manager_(manager) {
manager->view_factory_ =
- base::Bind(&MockPermissionBubbleFactory::Create, base::Unretained(this));
+ base::Bind(&MockPermissionPromptFactory::Create, base::Unretained(this));
}
-MockPermissionBubbleFactory::~MockPermissionBubbleFactory() {
+MockPermissionPromptFactory::~MockPermissionPromptFactory() {
manager_->view_factory_ =
- base::Bind(&MockPermissionBubbleFactory::DoNotCreate);
+ base::Bind(&MockPermissionPromptFactory::DoNotCreate);
while (!views_.empty()) {
views_.back()->factory_ = nullptr;
views_.pop_back();
}
}
-std::unique_ptr<PermissionBubbleView> MockPermissionBubbleFactory::Create(
+std::unique_ptr<PermissionPrompt> MockPermissionPromptFactory::Create(
Browser* browser) {
- MockPermissionBubbleView* view =
- new MockPermissionBubbleView(this, manager_);
+ MockPermissionPrompt* view =
raymes 2016/08/01 00:58:13 prompt
tsergeant 2016/08/01 23:41:12 Done.
+ new MockPermissionPrompt(this, manager_);
view->can_update_ui_ = can_update_ui_;
return base::WrapUnique(view);
}
-void MockPermissionBubbleFactory::SetCanUpdateUi(bool can_update_ui) {
+void MockPermissionPromptFactory::SetCanUpdateUi(bool can_update_ui) {
can_update_ui_ = can_update_ui;
for (auto* view : views_)
view->can_update_ui_ = can_update_ui_;
}
-void MockPermissionBubbleFactory::ResetCounts() {
+void MockPermissionPromptFactory::ResetCounts() {
show_count_ = 0;
requests_count_ = 0;
total_requests_count_ = 0;
}
-void MockPermissionBubbleFactory::DocumentOnLoadCompletedInMainFrame() {
+void MockPermissionPromptFactory::DocumentOnLoadCompletedInMainFrame() {
manager_->DocumentOnLoadCompletedInMainFrame();
}
-bool MockPermissionBubbleFactory::is_visible() {
+bool MockPermissionPromptFactory::is_visible() {
for (auto* view : views_) {
if (view->IsVisible())
return true;
@@ -63,7 +63,7 @@ bool MockPermissionBubbleFactory::is_visible() {
return false;
}
-void MockPermissionBubbleFactory::WaitForPermissionBubble() {
+void MockPermissionPromptFactory::WaitForPermissionBubble() {
if (is_visible())
return;
DCHECK(show_bubble_quit_closure_.is_null());
@@ -74,19 +74,19 @@ void MockPermissionBubbleFactory::WaitForPermissionBubble() {
}
// static
-std::unique_ptr<PermissionBubbleView> MockPermissionBubbleFactory::DoNotCreate(
- Browser* browser) {
+std::unique_ptr<PermissionPrompt>
+MockPermissionPromptFactory::DoNotCreate(Browser* browser) {
NOTREACHED();
return base::WrapUnique(
- new MockPermissionBubbleView(nullptr, nullptr));
+ new MockPermissionPrompt(nullptr, nullptr));
}
-void MockPermissionBubbleFactory::UpdateResponseType() {
+void MockPermissionPromptFactory::UpdateResponseType() {
manager_->set_auto_response_for_test(response_type_);
}
-void MockPermissionBubbleFactory::ShowView(MockPermissionBubbleView* view) {
- for (std::vector<MockPermissionBubbleView*>::iterator iter = views_.begin();
+void MockPermissionPromptFactory::ShowView(MockPermissionPrompt* view) {
+ for (std::vector<MockPermissionPrompt*>::iterator iter = views_.begin();
iter != views_.end(); ++iter) {
if (*iter == view)
return;
@@ -97,8 +97,8 @@ void MockPermissionBubbleFactory::ShowView(MockPermissionBubbleView* view) {
show_bubble_quit_closure_.Run();
}
-void MockPermissionBubbleFactory::HideView(MockPermissionBubbleView* view) {
- for (std::vector<MockPermissionBubbleView*>::iterator iter = views_.begin();
+void MockPermissionPromptFactory::HideView(MockPermissionPrompt* view) {
+ for (std::vector<MockPermissionPrompt*>::iterator iter = views_.begin();
iter != views_.end(); ++iter) {
if (*iter == view) {
views_.erase(iter);

Powered by Google App Engine
This is Rietveld 408576698