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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2280753003: Clear |displayed_content_with_cert_errors_| on navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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
« no previous file with comments | « chrome/test/data/ssl/page_with_subresource.html ('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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 3371 matching lines...) Expand 10 before | Expand all | Expand 10 after
3382 did_first_visually_non_empty_paint_ = false; 3382 did_first_visually_non_empty_paint_ = false;
3383 3383
3384 // Reset theme color on navigation to new page. 3384 // Reset theme color on navigation to new page.
3385 theme_color_ = SK_ColorTRANSPARENT; 3385 theme_color_ = SK_ColorTRANSPARENT;
3386 } 3386 }
3387 3387
3388 if (!details.is_in_page) { 3388 if (!details.is_in_page) {
3389 // Once the main frame is navigated, we're no longer considered to have 3389 // Once the main frame is navigated, we're no longer considered to have
3390 // displayed insecure content. 3390 // displayed insecure content.
3391 displayed_insecure_content_ = false; 3391 displayed_insecure_content_ = false;
3392 displayed_content_with_cert_errors_ = false;
3392 SSLManager::NotifySSLInternalStateChanged( 3393 SSLManager::NotifySSLInternalStateChanged(
3393 GetController().GetBrowserContext()); 3394 GetController().GetBrowserContext());
3394 } 3395 }
3395 3396
3396 // Notify observers about navigation. 3397 // Notify observers about navigation.
3397 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3398 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3398 DidNavigateMainFrame(details, params)); 3399 DidNavigateMainFrame(details, params));
3399 3400
3400 if (delegate_) 3401 if (delegate_)
3401 delegate_->DidNavigateMainFramePostCommit(this); 3402 delegate_->DidNavigateMainFramePostCommit(this);
(...skipping 1811 matching lines...) Expand 10 before | Expand all | Expand 10 after
5213 for (RenderViewHost* render_view_host : render_view_host_set) 5214 for (RenderViewHost* render_view_host : render_view_host_set)
5214 render_view_host->OnWebkitPreferencesChanged(); 5215 render_view_host->OnWebkitPreferencesChanged();
5215 } 5216 }
5216 5217
5217 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5218 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5218 JavaScriptDialogManager* dialog_manager) { 5219 JavaScriptDialogManager* dialog_manager) {
5219 dialog_manager_ = dialog_manager; 5220 dialog_manager_ = dialog_manager;
5220 } 5221 }
5221 5222
5222 } // namespace content 5223 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/data/ssl/page_with_subresource.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698