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

Side by Side Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 12676030: Fix a param signature in BrowserPluginGuest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/browser/browser_plugin/browser_plugin_guest.h" 5 #include "content/browser/browser_plugin/browser_plugin_guest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 SendMessageToEmbedder( 493 SendMessageToEmbedder(
494 new BrowserPluginMsg_LoadRedirect(instance_id(), 494 new BrowserPluginMsg_LoadRedirect(instance_id(),
495 old_url, 495 old_url,
496 new_url, 496 new_url,
497 is_top_level)); 497 is_top_level));
498 } 498 }
499 499
500 void BrowserPluginGuest::AskEmbedderForGeolocationPermission( 500 void BrowserPluginGuest::AskEmbedderForGeolocationPermission(
501 int bridge_id, 501 int bridge_id,
502 const GURL& requesting_frame, 502 const GURL& requesting_frame,
503 GeolocationCallback callback) { 503 const GeolocationCallback& callback) {
504 if (geolocation_request_callback_map_.size() >= 504 if (geolocation_request_callback_map_.size() >=
505 kNumMaxOutstandingPermissionRequests) { 505 kNumMaxOutstandingPermissionRequests) {
506 // Deny the geolocation request. 506 // Deny the geolocation request.
507 callback.Run(false); 507 callback.Run(false);
508 return; 508 return;
509 } 509 }
510 int request_id = next_permission_request_id_++; 510 int request_id = next_permission_request_id_++;
511 geolocation_request_callback_map_[request_id] = callback; 511 geolocation_request_callback_map_[request_id] = callback;
512 512
513 base::DictionaryValue request_info; 513 base::DictionaryValue request_info;
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 LOG(INFO) << "Guest not found. Instance ID: " << instance_id; 1218 LOG(INFO) << "Guest not found. Instance ID: " << instance_id;
1219 return; 1219 return;
1220 } 1220 }
1221 if (!should_allow) 1221 if (!should_allow)
1222 guest->Destroy(); 1222 guest->Destroy();
1223 // If we do not destroy the guest then we allow the new window. 1223 // If we do not destroy the guest then we allow the new window.
1224 new_window_request_map_.erase(new_window_request_iter); 1224 new_window_request_map_.erase(new_window_request_iter);
1225 } 1225 }
1226 1226
1227 } // namespace content 1227 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698