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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 4862002: Prevent a crash when visiting about:hang in two NTPs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix indent Created 10 years, 1 month 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 | « chrome/browser/tab_contents/render_view_host_manager.cc ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 NavigationController::ReloadType reload_type) { 857 NavigationController::ReloadType reload_type) {
858 RenderViewHost* dest_render_view_host = render_manager_.Navigate(entry); 858 RenderViewHost* dest_render_view_host = render_manager_.Navigate(entry);
859 if (!dest_render_view_host) 859 if (!dest_render_view_host)
860 return false; // Unable to create the desired render view host. 860 return false; // Unable to create the desired render view host.
861 861
862 if (delegate_ && delegate_->ShouldEnablePreferredSizeNotifications()) { 862 if (delegate_ && delegate_->ShouldEnablePreferredSizeNotifications()) {
863 dest_render_view_host->EnablePreferredSizeChangedMode( 863 dest_render_view_host->EnablePreferredSizeChangedMode(
864 kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow); 864 kPreferredSizeWidth | kPreferredSizeHeightThisIsSlow);
865 } 865 }
866 866
867 // For security, we should never send non-DOM-UI URLs (other than about:blank) 867 // For security, we should never send non-DOM-UI URLs to a DOM UI renderer.
868 // to a DOM UI renderer. Double check that here. 868 // Double check that here.
869 int enabled_bindings = dest_render_view_host->enabled_bindings(); 869 int enabled_bindings = dest_render_view_host->enabled_bindings();
870 bool is_allowed_in_dom_ui_renderer = 870 bool is_allowed_in_dom_ui_renderer =
871 DOMUIFactory::UseDOMUIForURL(profile(), entry.url()) || 871 DOMUIFactory::IsURLAcceptableForDOMUI(profile(), entry.url());
872 entry.url() == GURL(chrome::kAboutBlankURL);
873 CHECK(!BindingsPolicy::is_dom_ui_enabled(enabled_bindings) || 872 CHECK(!BindingsPolicy::is_dom_ui_enabled(enabled_bindings) ||
874 is_allowed_in_dom_ui_renderer); 873 is_allowed_in_dom_ui_renderer);
875 874
876 // Tell DevTools agent that it is attached prior to the navigation. 875 // Tell DevTools agent that it is attached prior to the navigation.
877 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); 876 DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
878 if (devtools_manager) { // NULL in unit tests. 877 if (devtools_manager) { // NULL in unit tests.
879 devtools_manager->OnNavigatingToPendingEntry(render_view_host(), 878 devtools_manager->OnNavigatingToPendingEntry(render_view_host(),
880 dest_render_view_host, 879 dest_render_view_host,
881 entry.url()); 880 entry.url());
882 } 881 }
(...skipping 2443 matching lines...) Expand 10 before | Expand all | Expand 10 after
3326 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save)); 3325 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
3327 } 3326 }
3328 3327
3329 Profile* TabContents::GetProfileForPasswordManager() { 3328 Profile* TabContents::GetProfileForPasswordManager() {
3330 return profile(); 3329 return profile();
3331 } 3330 }
3332 3331
3333 bool TabContents::DidLastPageLoadEncounterSSLErrors() { 3332 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
3334 return controller().ssl_manager()->ProcessedSSLErrorFromRequest(); 3333 return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
3335 } 3334 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_host_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698