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

Side by Side Diff: chrome/browser/content_settings/permission_bubble_request_impl.h

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android geolocation breakage Created 5 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" 9 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
10 #include "components/content_settings/core/common/content_settings.h"
10 #include "components/content_settings/core/common/content_settings_types.h" 11 #include "components/content_settings/core/common/content_settings_types.h"
11 #include "components/content_settings/core/common/permission_request_id.h" 12 #include "components/content_settings/core/common/permission_request_id.h"
12 13
13 class GURL; 14 class GURL;
14 15
15 class PermissionContextBase; 16 class PermissionContextBase;
16 17
17 // Default implementation of PermissionBubbleRequest, it is assumed that the 18 // Default implementation of PermissionBubbleRequest, it is assumed that the
18 // caller owns it and that it can be deleted once the |delete_callback| 19 // caller owns it and that it can be deleted once the |delete_callback|
19 // is executed. 20 // is executed.
20 class PermissionBubbleRequestImpl : public PermissionBubbleRequest { 21 class PermissionBubbleRequestImpl : public PermissionBubbleRequest {
21 public: 22 public:
22 23 using PermissionDecidedCallback = base::Callback<void(bool, ContentSetting)>;
23 typedef base::Callback<void(bool persist_permission, bool grant_permission)>
24 PermissionDecidedCallback;
25 24
26 PermissionBubbleRequestImpl( 25 PermissionBubbleRequestImpl(
27 const GURL& request_origin, 26 const GURL& request_origin,
28 bool user_gesture, 27 bool user_gesture,
29 ContentSettingsType type, 28 ContentSettingsType type,
30 const std::string& display_languages, 29 const std::string& display_languages,
31 const PermissionDecidedCallback permission_decided_callback, 30 const PermissionDecidedCallback& permission_decided_callback,
32 const base::Closure delete_callback); 31 const base::Closure delete_callback);
33 32
34 ~PermissionBubbleRequestImpl() override; 33 ~PermissionBubbleRequestImpl() override;
35 34
36 // PermissionBubbleRequest: 35 // PermissionBubbleRequest:
37 int GetIconID() const override; 36 int GetIconID() const override;
38 base::string16 GetMessageText() const override; 37 base::string16 GetMessageText() const override;
39 base::string16 GetMessageTextFragment() const override; 38 base::string16 GetMessageTextFragment() const override;
40 bool HasUserGesture() const override; 39 bool HasUserGesture() const override;
41 40
(...skipping 22 matching lines...) Expand all
64 // Called when the bubble is no longer in use so it can be deleted by 63 // Called when the bubble is no longer in use so it can be deleted by
65 // the caller. 64 // the caller.
66 const base::Closure delete_callback_; 65 const base::Closure delete_callback_;
67 bool is_finished_; 66 bool is_finished_;
68 bool action_taken_; 67 bool action_taken_;
69 68
70 DISALLOW_COPY_AND_ASSIGN(PermissionBubbleRequestImpl); 69 DISALLOW_COPY_AND_ASSIGN(PermissionBubbleRequestImpl);
71 }; 70 };
72 71
73 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_ 72 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698