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

Side by Side Diff: chrome/browser/ssl/ssl_manager.h

Issue 99247: Stop the location bar from flashing white when navigating from one HTTPS site... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 7 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #ifndef CHROME_BROWSER_SSL_SSL_MANAGER_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_MANAGER_H_
6 #define CHROME_BROWSER_SSL_SSL_MANAGER_H_ 6 #define CHROME_BROWSER_SSL_SSL_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 void OnMixedContent(MixedContentHandler* handler); 438 void OnMixedContent(MixedContentHandler* handler);
439 439
440 // Entry point for navigation. This function begins the process of updating 440 // Entry point for navigation. This function begins the process of updating
441 // the security UI when the main frame navigates to a new URL. 441 // the security UI when the main frame navigates to a new URL.
442 // 442 //
443 // Called on the UI thread. 443 // Called on the UI thread.
444 virtual void Observe(NotificationType type, 444 virtual void Observe(NotificationType type,
445 const NotificationSource& source, 445 const NotificationSource& source,
446 const NotificationDetails& details); 446 const NotificationDetails& details);
447 447
448 // This entry point is called directly (instead of via the notification
449 // service) because we need more precise control of the order in which folks
450 // are notified of this event.
451 void DidCommitProvisionalLoad(const NotificationDetails& details);
452
448 // Called to determine if there were any processed SSL errors from request. 453 // Called to determine if there were any processed SSL errors from request.
449 bool ProcessedSSLErrorFromRequest() const; 454 bool ProcessedSSLErrorFromRequest() const;
450 455
451 // The navigation controller associated with this SSLManager. The 456 // The navigation controller associated with this SSLManager. The
452 // NavigationController is guaranteed to outlive the SSLManager. 457 // NavigationController is guaranteed to outlive the SSLManager.
453 NavigationController* controller() { return controller_; } 458 NavigationController* controller() { return controller_; }
454 459
455 // Convenience methods for serializing/deserializing the security info. 460 // Convenience methods for serializing/deserializing the security info.
456 static std::string SerializeSecurityInfo(int cert_id, 461 static std::string SerializeSecurityInfo(int cert_id,
457 int cert_status, 462 int cert_status,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 std::wstring message; 496 std::wstring message;
492 std::wstring link_text; 497 std::wstring link_text;
493 Task* action; 498 Task* action;
494 }; 499 };
495 500
496 // Entry points for notifications to which we subscribe. Note that 501 // Entry points for notifications to which we subscribe. Note that
497 // DidCommitProvisionalLoad uses the abstract NotificationDetails type since 502 // DidCommitProvisionalLoad uses the abstract NotificationDetails type since
498 // the type we need is in NavigationController which would create a circular 503 // the type we need is in NavigationController which would create a circular
499 // header file dependency. 504 // header file dependency.
500 void DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details); 505 void DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details);
501 void DidCommitProvisionalLoad(const NotificationDetails& details);
502 void DidFailProvisionalLoadWithError(ProvisionalLoadDetails* details); 506 void DidFailProvisionalLoadWithError(ProvisionalLoadDetails* details);
503 void DidStartResourceResponse(ResourceRequestDetails* details); 507 void DidStartResourceResponse(ResourceRequestDetails* details);
504 void DidReceiveResourceRedirect(ResourceRedirectDetails* details); 508 void DidReceiveResourceRedirect(ResourceRedirectDetails* details);
505 void DidChangeSSLInternalState(); 509 void DidChangeSSLInternalState();
506 510
507 // Dispatch NotificationType::SSL_INTERNAL_STATE_CHANGED notification. 511 // Dispatch NotificationType::SSL_INTERNAL_STATE_CHANGED notification.
508 void DispatchSSLInternalStateChanged(); 512 void DispatchSSLInternalStateChanged();
509 513
510 // Dispatch NotificationType::SSL_VISIBLE_STATE_CHANGED notification. 514 // Dispatch NotificationType::SSL_VISIBLE_STATE_CHANGED notification.
511 void DispatchSSLVisibleStateChanged(); 515 void DispatchSSLVisibleStateChanged();
(...skipping 22 matching lines...) Expand all
534 SSLHostState* ssl_host_state_; 538 SSLHostState* ssl_host_state_;
535 539
536 // The list of messages that should be displayed (in info bars) when the page 540 // The list of messages that should be displayed (in info bars) when the page
537 // currently loading had loaded. 541 // currently loading had loaded.
538 std::vector<SSLMessageInfo> pending_messages_; 542 std::vector<SSLMessageInfo> pending_messages_;
539 543
540 DISALLOW_COPY_AND_ASSIGN(SSLManager); 544 DISALLOW_COPY_AND_ASSIGN(SSLManager);
541 }; 545 };
542 546
543 #endif // CHROME_BROWSER_SSL_SSL_MANAGER_H_ 547 #endif // CHROME_BROWSER_SSL_SSL_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ssl/ssl_manager.cc » ('j') | chrome/browser/tab_contents/navigation_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698