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

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

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 #include "chrome/browser/content_settings/permission_bubble_request_impl.h" 5 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
6 6
7 #include "chrome/browser/content_settings/permission_context_base.h" 7 #include "chrome/browser/content_settings/permission_context_base.h"
8 #include "chrome/browser/content_settings/permission_context_uma_util.h" 8 #include "chrome/browser/content_settings/permission_context_uma_util.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
11 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 13
14 PermissionBubbleRequestImpl::PermissionBubbleRequestImpl( 14 PermissionBubbleRequestImpl::PermissionBubbleRequestImpl(
15 const GURL& request_origin, 15 const GURL& request_origin,
16 bool user_gesture, 16 bool user_gesture,
17 ContentSettingsType type, 17 ContentSettingsType type,
18 const std::string& display_languages, 18 const std::string& display_languages,
19 const base::Callback<void(bool, bool)> permission_decided_callback, 19 const PermissionDecidedCallback& permission_decided_callback,
20 const base::Closure delete_callback) 20 const base::Closure delete_callback)
21 : request_origin_(request_origin), 21 : request_origin_(request_origin),
22 user_gesture_(user_gesture), 22 user_gesture_(user_gesture),
23 type_(type), 23 type_(type),
24 display_languages_(display_languages), 24 display_languages_(display_languages),
25 permission_decided_callback_(permission_decided_callback), 25 permission_decided_callback_(permission_decided_callback),
26 delete_callback_(delete_callback), 26 delete_callback_(delete_callback),
27 is_finished_(false), 27 is_finished_(false),
28 action_taken_(false) { 28 action_taken_(false) {
29 } 29 }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 bool PermissionBubbleRequestImpl::HasUserGesture() const { 129 bool PermissionBubbleRequestImpl::HasUserGesture() const {
130 return user_gesture_; 130 return user_gesture_;
131 } 131 }
132 132
133 GURL PermissionBubbleRequestImpl::GetRequestingHostname() const { 133 GURL PermissionBubbleRequestImpl::GetRequestingHostname() const {
134 return request_origin_; 134 return request_origin_;
135 } 135 }
136 136
137 void PermissionBubbleRequestImpl::PermissionGranted() { 137 void PermissionBubbleRequestImpl::PermissionGranted() {
138 RegisterActionTaken(); 138 RegisterActionTaken();
139 permission_decided_callback_.Run(true, true); 139 permission_decided_callback_.Run(true, CONTENT_SETTING_ALLOW);
140 } 140 }
141 141
142 void PermissionBubbleRequestImpl::PermissionDenied() { 142 void PermissionBubbleRequestImpl::PermissionDenied() {
143 RegisterActionTaken(); 143 RegisterActionTaken();
144 permission_decided_callback_.Run(true, false); 144 permission_decided_callback_.Run(true, CONTENT_SETTING_BLOCK);
145 } 145 }
146 146
147 void PermissionBubbleRequestImpl::Cancelled() { 147 void PermissionBubbleRequestImpl::Cancelled() {
148 RegisterActionTaken(); 148 RegisterActionTaken();
149 permission_decided_callback_.Run(false, false); 149 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
150 } 150 }
151 151
152 void PermissionBubbleRequestImpl::RequestFinished() { 152 void PermissionBubbleRequestImpl::RequestFinished() {
153 is_finished_ = true; 153 is_finished_ = true;
154 delete_callback_.Run(); 154 delete_callback_.Run();
155 } 155 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698