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

Side by Side Diff: content/browser/tab_contents/provisional_load_details.h

Issue 7995014: Revert 102322 - For the SSL cert status, convert anonymous enum that gives bit values into a type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | 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 #ifndef CONTENT_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "content/common/page_transition_types.h" 12 #include "content/common/page_transition_types.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "net/base/cert_status_flags.h"
15 14
16 // This class captures some of the information associated to the provisional 15 // This class captures some of the information associated to the provisional
17 // load of a frame. It is provided as Details with the 16 // load of a frame. It is provided as Details with the
18 // NOTIFY_FAIL_PROVISIONAL_LOAD_WITH_ERROR notification 17 // NOTIFY_FAIL_PROVISIONAL_LOAD_WITH_ERROR notification
19 // (see notification_types.h). 18 // (see notification_types.h).
20 19
21 // TODO(brettw) this mostly duplicates 20 // TODO(brettw) this mostly duplicates
22 // NavigationController::LoadCommittedDetails, it would be nice to unify these 21 // NavigationController::LoadCommittedDetails, it would be nice to unify these
23 // somehow. 22 // somehow.
24 class ProvisionalLoadDetails { 23 class ProvisionalLoadDetails {
(...skipping 17 matching lines...) Expand all
42 } 41 }
43 42
44 const GURL& url() const { return url_; } 43 const GURL& url() const { return url_; }
45 44
46 bool main_frame() const { return is_main_frame_; } 45 bool main_frame() const { return is_main_frame_; }
47 46
48 bool in_page_navigation() const { return is_in_page_navigation_; } 47 bool in_page_navigation() const { return is_in_page_navigation_; }
49 48
50 int ssl_cert_id() const { return ssl_cert_id_; } 49 int ssl_cert_id() const { return ssl_cert_id_; }
51 50
52 net::CertStatus ssl_cert_status() const { return ssl_cert_status_; } 51 int ssl_cert_status() const { return ssl_cert_status_; }
53 52
54 int ssl_security_bits() const { return ssl_security_bits_; } 53 int ssl_security_bits() const { return ssl_security_bits_; }
55 54
56 int ssl_connection_status() const { return ssl_connection_status_; } 55 int ssl_connection_status() const { return ssl_connection_status_; }
57 56
58 bool is_error_page() const { return is_error_page_; } 57 bool is_error_page() const { return is_error_page_; }
59 58
60 int64 frame_id() const { return frame_id_; } 59 int64 frame_id() const { return frame_id_; }
61 60
62 private: 61 private:
63 int error_code_; 62 int error_code_;
64 PageTransition::Type transition_type_; 63 PageTransition::Type transition_type_;
65 GURL url_; 64 GURL url_;
66 bool is_main_frame_; 65 bool is_main_frame_;
67 bool is_in_page_navigation_; 66 bool is_in_page_navigation_;
68 int ssl_cert_id_; 67 int ssl_cert_id_;
69 net::CertStatus ssl_cert_status_; 68 int ssl_cert_status_;
70 int ssl_security_bits_; 69 int ssl_security_bits_;
71 int ssl_connection_status_; 70 int ssl_connection_status_;
72 bool is_error_page_; 71 bool is_error_page_;
73 int64 frame_id_; 72 int64 frame_id_;
74 73
75 DISALLOW_COPY_AND_ASSIGN(ProvisionalLoadDetails); 74 DISALLOW_COPY_AND_ASSIGN(ProvisionalLoadDetails);
76 }; 75 };
77 76
78 #endif // CONTENT_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_ 77 #endif // CONTENT_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
OLDNEW
« no previous file with comments | « content/browser/tab_contents/navigation_entry_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698