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

Side by Side Diff: chrome/browser/geolocation/geolocation_permission_context.cc

Issue 341833004: [WebsiteSettings] Enable permission bubbles by default. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/geolocation/geolocation_permission_context.h" 5 #include "chrome/browser/geolocation/geolocation_permission_context.h"
6 6
7 #include <functional> 7 #include <functional>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 return requesting_frame_; 103 return requesting_frame_;
104 } 104 }
105 105
106 void GeolocationPermissionRequest::PermissionGranted() { 106 void GeolocationPermissionRequest::PermissionGranted() {
107 context_->QueueController()->UpdateContentSetting( 107 context_->QueueController()->UpdateContentSetting(
108 requesting_frame_, embedder_, true); 108 requesting_frame_, embedder_, true);
109 context_->NotifyPermissionSet(id_, requesting_frame_, callback_, true); 109 context_->NotifyPermissionSet(id_, requesting_frame_, callback_, true);
110 } 110 }
111 111
112 void GeolocationPermissionRequest::PermissionDenied() { 112 void GeolocationPermissionRequest::PermissionDenied() {
113 LOG(INFO) << "denied";
113 context_->QueueController()->UpdateContentSetting( 114 context_->QueueController()->UpdateContentSetting(
114 requesting_frame_, embedder_, false); 115 requesting_frame_, embedder_, false);
115 context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false); 116 context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
116 } 117 }
117 118
118 void GeolocationPermissionRequest::Cancelled() { 119 void GeolocationPermissionRequest::Cancelled() {
119 } 120 }
120 121
121 void GeolocationPermissionRequest::RequestFinished() { 122 void GeolocationPermissionRequest::RequestFinished() {
122 // Deletes 'this'. 123 // Deletes 'this'.
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 if (cancelling != NULL && web_contents != NULL && 334 if (cancelling != NULL && web_contents != NULL &&
334 PermissionBubbleManager::FromWebContents(web_contents) != NULL) { 335 PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
335 PermissionBubbleManager::FromWebContents(web_contents)-> 336 PermissionBubbleManager::FromWebContents(web_contents)->
336 CancelRequest(cancelling); 337 CancelRequest(cancelling);
337 } 338 }
338 return; 339 return;
339 } 340 }
340 341
341 QueueController()->CancelInfoBarRequest(id); 342 QueueController()->CancelInfoBarRequest(id);
342 } 343 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698