| Index: chrome/browser/ui/website_settings/mock_permission_prompt_factory.h
|
| diff --git a/chrome/browser/ui/website_settings/mock_permission_bubble_factory.h b/chrome/browser/ui/website_settings/mock_permission_prompt_factory.h
|
| similarity index 67%
|
| rename from chrome/browser/ui/website_settings/mock_permission_bubble_factory.h
|
| rename to chrome/browser/ui/website_settings/mock_permission_prompt_factory.h
|
| index 5574e0dce70af22d58d0c7ad178b3365d1828d3c..7259affd45493833fa4ef0c946178402a7912ece 100644
|
| --- a/chrome/browser/ui/website_settings/mock_permission_bubble_factory.h
|
| +++ b/chrome/browser/ui/website_settings/mock_permission_prompt_factory.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_FACTORY_H_
|
| -#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_FACTORY_H_
|
| +#ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_PROMPT_FACTORY_H_
|
| +#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_PROMPT_FACTORY_H_
|
|
|
| #include <memory>
|
| #include <vector>
|
| @@ -11,21 +11,21 @@
|
| #include "chrome/browser/permissions/permission_request_manager.h"
|
|
|
| class Browser;
|
| -class PermissionBubbleView;
|
| -class MockPermissionBubbleView;
|
| +class MockPermissionPrompt;
|
| +class PermissionPrompt;
|
|
|
| // Provides a skeleton class for both unit and browser testing when trying to
|
| // test the bubble manager logic. Should not be used for anything that requires
|
| // actual UI.
|
| // See example usage in
|
| // chrome/browser/permissions/permission_request_manager_unittest.cc
|
| -class MockPermissionBubbleFactory {
|
| +class MockPermissionPromptFactory {
|
| public:
|
| - explicit MockPermissionBubbleFactory(PermissionRequestManager* manager);
|
| - ~MockPermissionBubbleFactory();
|
| + explicit MockPermissionPromptFactory(PermissionRequestManager* manager);
|
| + ~MockPermissionPromptFactory();
|
|
|
| // Create method called by the PBM to show a bubble.
|
| - std::unique_ptr<PermissionBubbleView> Create(Browser* browser);
|
| + std::unique_ptr<PermissionPrompt> Create(Browser* browser);
|
|
|
| void SetCanUpdateUi(bool can_update_ui);
|
|
|
| @@ -49,21 +49,21 @@ class MockPermissionBubbleFactory {
|
| void WaitForPermissionBubble();
|
|
|
| private:
|
| - friend class MockPermissionBubbleView;
|
| + friend class MockPermissionPrompt;
|
|
|
| // This shouldn't be called. Is here to fail tests that try to create a bubble
|
| // after the factory has been destroyed.
|
| - static std::unique_ptr<PermissionBubbleView> DoNotCreate(Browser* browser);
|
| + static std::unique_ptr<PermissionPrompt> DoNotCreate(Browser* browser);
|
|
|
| void UpdateResponseType();
|
| - void ShowView(MockPermissionBubbleView* view);
|
| - void HideView(MockPermissionBubbleView* view);
|
| + void ShowView(MockPermissionPrompt* view);
|
| + void HideView(MockPermissionPrompt* view);
|
|
|
| bool can_update_ui_;
|
| int show_count_;
|
| int requests_count_;
|
| int total_requests_count_;
|
| - std::vector<MockPermissionBubbleView*> views_;
|
| + std::vector<MockPermissionPrompt*> prompts_;
|
| PermissionRequestManager::AutoResponseType response_type_;
|
|
|
| base::Closure show_bubble_quit_closure_;
|
| @@ -71,7 +71,7 @@ class MockPermissionBubbleFactory {
|
| // The bubble manager that will be associated with this factory.
|
| PermissionRequestManager* manager_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(MockPermissionBubbleFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(MockPermissionPromptFactory);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_FACTORY_H_
|
| +#endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_PROMPT_FACTORY_H_
|
|
|