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

Side by Side Diff: content/browser/renderer_host/render_view_host.cc

Issue 9801002: Simplest backport of 117417. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/
Patch Set: Created 8 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer_host/render_view_host.h" 5 #include "content/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 // The renderer treats all URLs in the about: scheme as being about:blank. 1319 // The renderer treats all URLs in the about: scheme as being about:blank.
1320 // Canonicalize about: URLs to about:blank. 1320 // Canonicalize about: URLs to about:blank.
1321 *url = GURL(chrome::kAboutBlankURL); 1321 *url = GURL(chrome::kAboutBlankURL);
1322 } 1322 }
1323 1323
1324 if (!policy->CanRequestURL(renderer_id, *url)) { 1324 if (!policy->CanRequestURL(renderer_id, *url)) {
1325 // If this renderer is not permitted to request this URL, we invalidate the 1325 // If this renderer is not permitted to request this URL, we invalidate the
1326 // URL. This prevents us from storing the blocked URL and becoming confused 1326 // URL. This prevents us from storing the blocked URL and becoming confused
1327 // later. 1327 // later.
1328 VLOG(1) << "Blocked URL " << url->spec(); 1328 VLOG(1) << "Blocked URL " << url->spec();
1329 *url = GURL(); 1329 *url = GURL(chrome::kAboutBlankURL);
1330 } 1330 }
1331 } 1331 }
1332 1332
1333 void RenderViewHost::SetAltErrorPageURL(const GURL& url) { 1333 void RenderViewHost::SetAltErrorPageURL(const GURL& url) {
1334 Send(new ViewMsg_SetAltErrorPageURL(routing_id(), url)); 1334 Send(new ViewMsg_SetAltErrorPageURL(routing_id(), url));
1335 } 1335 }
1336 1336
1337 void RenderViewHost::ExitFullscreen() { 1337 void RenderViewHost::ExitFullscreen() {
1338 RejectMouseLockOrUnlockIfNecessary(); 1338 RejectMouseLockOrUnlockIfNecessary();
1339 1339
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 1548
1549 void RenderViewHost::OnWebUISend(const GURL& source_url, 1549 void RenderViewHost::OnWebUISend(const GURL& source_url,
1550 const std::string& name, 1550 const std::string& name,
1551 const base::ListValue& args) { 1551 const base::ListValue& args) {
1552 delegate_->WebUISend(this, source_url, name, args); 1552 delegate_->WebUISend(this, source_url, name, args);
1553 } 1553 }
1554 1554
1555 void RenderViewHost::ClearPowerSaveBlockers() { 1555 void RenderViewHost::ClearPowerSaveBlockers() {
1556 STLDeleteValues(&power_save_blockers_); 1556 STLDeleteValues(&power_save_blockers_);
1557 } 1557 }
OLDNEW
« no previous file with comments | « content/browser/mock_content_browser_client.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698