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

Side by Side Diff: content/browser/tab_contents/navigation_entry.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_NAVIGATION_ENTRY_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_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 "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "content/common/page_transition_types.h" 14 #include "content/common/page_transition_types.h"
15 #include "content/common/page_type.h" 15 #include "content/common/page_type.h"
16 #include "content/common/security_style.h" 16 #include "content/common/security_style.h"
17 #include "googleurl/src/gurl.h" 17 #include "googleurl/src/gurl.h"
18 #include "net/base/cert_status_flags.h"
19 #include "third_party/skia/include/core/SkBitmap.h" 18 #include "third_party/skia/include/core/SkBitmap.h"
20 19
21 class SiteInstance; 20 class SiteInstance;
22 21
23 //////////////////////////////////////////////////////////////////////////////// 22 ////////////////////////////////////////////////////////////////////////////////
24 // 23 //
25 // NavigationEntry class 24 // NavigationEntry class
26 // 25 //
27 // A NavigationEntry is a data structure that captures all the information 26 // A NavigationEntry is a data structure that captures all the information
28 // required to recreate a browsing state. This includes some opaque binary 27 // required to recreate a browsing state. This includes some opaque binary
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 return security_style_; 68 return security_style_;
70 } 69 }
71 70
72 void set_cert_id(int ssl_cert_id) { 71 void set_cert_id(int ssl_cert_id) {
73 cert_id_ = ssl_cert_id; 72 cert_id_ = ssl_cert_id;
74 } 73 }
75 int cert_id() const { 74 int cert_id() const {
76 return cert_id_; 75 return cert_id_;
77 } 76 }
78 77
79 void set_cert_status(net::CertStatus ssl_cert_status) { 78 void set_cert_status(int ssl_cert_status) {
80 cert_status_ = ssl_cert_status; 79 cert_status_ = ssl_cert_status;
81 } 80 }
82 net::CertStatus cert_status() const { 81 int cert_status() const {
83 return cert_status_; 82 return cert_status_;
84 } 83 }
85 84
86 void set_security_bits(int security_bits) { 85 void set_security_bits(int security_bits) {
87 security_bits_ = security_bits; 86 security_bits_ = security_bits;
88 } 87 }
89 int security_bits() const { 88 int security_bits() const {
90 return security_bits_; 89 return security_bits_;
91 } 90 }
92 91
(...skipping 26 matching lines...) Expand all
119 content_status_ = content_status; 118 content_status_ = content_status;
120 } 119 }
121 int content_status() const { 120 int content_status() const {
122 return content_status_; 121 return content_status_;
123 } 122 }
124 123
125 private: 124 private:
126 // See the accessors above for descriptions. 125 // See the accessors above for descriptions.
127 SecurityStyle security_style_; 126 SecurityStyle security_style_;
128 int cert_id_; 127 int cert_id_;
129 net::CertStatus cert_status_; 128 int cert_status_;
130 int security_bits_; 129 int security_bits_;
131 int connection_status_; 130 int connection_status_;
132 int content_status_; 131 int content_status_;
133 132
134 // Copy and assignment is explicitly allowed for this class. 133 // Copy and assignment is explicitly allowed for this class.
135 }; 134 };
136 135
137 // Favicon ------------------------------------------------------------------- 136 // Favicon -------------------------------------------------------------------
138 137
139 // Collects the favicon related information for a NavigationEntry. 138 // Collects the favicon related information for a NavigationEntry.
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 // This is a cached version of the result of GetTitleForDisplay. It prevents 432 // This is a cached version of the result of GetTitleForDisplay. It prevents
434 // us from having to do URL formatting on the URL every time the title is 433 // us from having to do URL formatting on the URL every time the title is
435 // displayed. When the URL, virtual URL, or title is set, this should be 434 // displayed. When the URL, virtual URL, or title is set, this should be
436 // cleared to force a refresh. 435 // cleared to force a refresh.
437 mutable string16 cached_display_title_; 436 mutable string16 cached_display_title_;
438 437
439 // Copy and assignment is explicitly allowed for this class. 438 // Copy and assignment is explicitly allowed for this class.
440 }; 439 };
441 440
442 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_ 441 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_request_info.cc ('k') | content/browser/tab_contents/navigation_entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698