| Index: chrome/browser/permissions/mock_permission_request.h
|
| diff --git a/chrome/browser/ui/website_settings/mock_permission_bubble_request.h b/chrome/browser/permissions/mock_permission_request.h
|
| similarity index 62%
|
| rename from chrome/browser/ui/website_settings/mock_permission_bubble_request.h
|
| rename to chrome/browser/permissions/mock_permission_request.h
|
| index 38f27b88a2740e585557d9823cd134b1bf56884c..8b6564e767dc542bf2f8f77770a54812cfb89fec 100644
|
| --- a/chrome/browser/ui/website_settings/mock_permission_bubble_request.h
|
| +++ b/chrome/browser/permissions/mock_permission_request.h
|
| @@ -2,25 +2,25 @@
|
| // 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_REQUEST_H_
|
| -#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_REQUEST_H_
|
| +#ifndef CHROME_BROWSER_PERMISSIONS_MOCK_PERMISSION_REQUEST_H_
|
| +#define CHROME_BROWSER_PERMISSIONS_MOCK_PERMISSION_REQUEST_H_
|
|
|
| #include "base/strings/string16.h"
|
| -#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
|
| +#include "chrome/browser/permissions/permission_request.h"
|
| #include "url/gurl.h"
|
|
|
| -class MockPermissionBubbleRequest : public PermissionBubbleRequest {
|
| +class MockPermissionRequest : public PermissionRequest {
|
| public:
|
| - MockPermissionBubbleRequest();
|
| - explicit MockPermissionBubbleRequest(const std::string& text);
|
| - MockPermissionBubbleRequest(const std::string& text,
|
| + MockPermissionRequest();
|
| + explicit MockPermissionRequest(const std::string& text);
|
| + MockPermissionRequest(const std::string& text,
|
| PermissionBubbleType bubble_type);
|
| - MockPermissionBubbleRequest(const std::string& text, const GURL& url);
|
| - MockPermissionBubbleRequest(const std::string& text,
|
| + MockPermissionRequest(const std::string& text, const GURL& url);
|
| + MockPermissionRequest(const std::string& text,
|
| const std::string& accept_label,
|
| const std::string& deny_label);
|
|
|
| - ~MockPermissionBubbleRequest() override;
|
| + ~MockPermissionRequest() override;
|
|
|
| int GetIconId() const override;
|
| base::string16 GetMessageTextFragment() const override;
|
| @@ -37,7 +37,7 @@ class MockPermissionBubbleRequest : public PermissionBubbleRequest {
|
| bool finished();
|
|
|
| private:
|
| - MockPermissionBubbleRequest(const std::string& text,
|
| + MockPermissionRequest(const std::string& text,
|
| const std::string& accept_label,
|
| const std::string& deny_label,
|
| const GURL& url,
|
| @@ -53,4 +53,4 @@ class MockPermissionBubbleRequest : public PermissionBubbleRequest {
|
| GURL origin_;
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_REQUEST_H_
|
| +#endif // CHROME_BROWSER_PERMISSIONS_MOCK_PERMISSION_REQUEST_H_
|
|
|