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

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

Issue 7819009: For the SSL cert status, convert anonymous enum that gives bit values into a typedefed uint32. Th... (Closed) Base URL: svn://chrome-svn/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"
18 #include "third_party/skia/include/core/SkBitmap.h" 19 #include "third_party/skia/include/core/SkBitmap.h"
19 20
20 class SiteInstance; 21 class SiteInstance;
21 22
22 //////////////////////////////////////////////////////////////////////////////// 23 ////////////////////////////////////////////////////////////////////////////////
23 // 24 //
24 // NavigationEntry class 25 // NavigationEntry class
25 // 26 //
26 // A NavigationEntry is a data structure that captures all the information 27 // A NavigationEntry is a data structure that captures all the information
27 // required to recreate a browsing state. This includes some opaque binary 28 // required to recreate a browsing state. This includes some opaque binary
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 return security_style_; 69 return security_style_;
69 } 70 }
70 71
71 void set_cert_id(int ssl_cert_id) { 72 void set_cert_id(int ssl_cert_id) {
72 cert_id_ = ssl_cert_id; 73 cert_id_ = ssl_cert_id;
73 } 74 }
74 int cert_id() const { 75 int cert_id() const {
75 return cert_id_; 76 return cert_id_;
76 } 77 }
77 78
78 void set_cert_status(int ssl_cert_status) { 79 void set_cert_status(net::CertStatus ssl_cert_status) {
79 cert_status_ = ssl_cert_status; 80 cert_status_ = ssl_cert_status;
80 } 81 }
81 int cert_status() const { 82 net::CertStatus cert_status() const {
82 return cert_status_; 83 return cert_status_;
83 } 84 }
84 85
85 void set_security_bits(int security_bits) { 86 void set_security_bits(int security_bits) {
86 security_bits_ = security_bits; 87 security_bits_ = security_bits;
87 } 88 }
88 int security_bits() const { 89 int security_bits() const {
89 return security_bits_; 90 return security_bits_;
90 } 91 }
91 92
(...skipping 26 matching lines...) Expand all
118 content_status_ = content_status; 119 content_status_ = content_status;
119 } 120 }
120 int content_status() const { 121 int content_status() const {
121 return content_status_; 122 return content_status_;
122 } 123 }
123 124
124 private: 125 private:
125 // See the accessors above for descriptions. 126 // See the accessors above for descriptions.
126 SecurityStyle security_style_; 127 SecurityStyle security_style_;
127 int cert_id_; 128 int cert_id_;
128 int cert_status_; 129 net::CertStatus cert_status_;
129 int security_bits_; 130 int security_bits_;
130 int connection_status_; 131 int connection_status_;
131 int content_status_; 132 int content_status_;
132 133
133 // Copy and assignment is explicitly allowed for this class. 134 // Copy and assignment is explicitly allowed for this class.
134 }; 135 };
135 136
136 // Favicon ------------------------------------------------------------------- 137 // Favicon -------------------------------------------------------------------
137 138
138 // Collects the favicon related information for a NavigationEntry. 139 // Collects the favicon related information for a NavigationEntry.
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 // This is a cached version of the result of GetTitleForDisplay. It prevents 433 // This is a cached version of the result of GetTitleForDisplay. It prevents
433 // us from having to do URL formatting on the URL every time the title is 434 // us from having to do URL formatting on the URL every time the title is
434 // displayed. When the URL, virtual URL, or title is set, this should be 435 // displayed. When the URL, virtual URL, or title is set, this should be
435 // cleared to force a refresh. 436 // cleared to force a refresh.
436 mutable string16 cached_display_title_; 437 mutable string16 cached_display_title_;
437 438
438 // Copy and assignment is explicitly allowed for this class. 439 // Copy and assignment is explicitly allowed for this class.
439 }; 440 };
440 441
441 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_ 442 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698