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

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

Issue 6621006: Take out the is_content_filtered bool that gets passed around betwen renderer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_CONTROLLER_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // By default, the entry will be filled according to a new main frame 52 // By default, the entry will be filled according to a new main frame
53 // navigation. 53 // navigation.
54 LoadCommittedDetails() 54 LoadCommittedDetails()
55 : entry(NULL), 55 : entry(NULL),
56 type(NavigationType::UNKNOWN), 56 type(NavigationType::UNKNOWN),
57 previous_entry_index(-1), 57 previous_entry_index(-1),
58 is_auto(false), 58 is_auto(false),
59 did_replace_entry(false), 59 did_replace_entry(false),
60 is_in_page(false), 60 is_in_page(false),
61 is_main_frame(true), 61 is_main_frame(true),
62 is_content_filtered(false),
63 http_status_code(0) { 62 http_status_code(0) {
64 } 63 }
65 64
66 // The committed entry. This will be the active entry in the controller. 65 // The committed entry. This will be the active entry in the controller.
67 NavigationEntry* entry; 66 NavigationEntry* entry;
68 67
69 // The type of navigation that just occurred. Note that not all types of 68 // The type of navigation that just occurred. Note that not all types of
70 // navigations in the enum are valid here, since some of them don't actually 69 // navigations in the enum are valid here, since some of them don't actually
71 // cause a "commit" and won't generate this notification. 70 // cause a "commit" and won't generate this notification.
72 NavigationType::Type type; 71 NavigationType::Type type;
(...skipping 18 matching lines...) Expand all
91 bool did_replace_entry; 90 bool did_replace_entry;
92 91
93 // True if the navigation was in-page. This means that the active entry's 92 // True if the navigation was in-page. This means that the active entry's
94 // URL and the |previous_url| are the same except for reference fragments. 93 // URL and the |previous_url| are the same except for reference fragments.
95 bool is_in_page; 94 bool is_in_page;
96 95
97 // True when the main frame was navigated. False means the navigation was a 96 // True when the main frame was navigated. False means the navigation was a
98 // sub-frame. 97 // sub-frame.
99 bool is_main_frame; 98 bool is_main_frame;
100 99
101 // Whether the content of this frame has been altered/blocked because it was
102 // unsafe.
103 bool is_content_filtered;
104
105 // When the committed load is a web page from the renderer, this string 100 // When the committed load is a web page from the renderer, this string
106 // specifies the security state if the page is secure. 101 // specifies the security state if the page is secure.
107 // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from. 102 // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from.
108 // Use SSLManager::DeserializeSecurityInfo to decode it. 103 // Use SSLManager::DeserializeSecurityInfo to decode it.
109 std::string serialized_security_info; 104 std::string serialized_security_info;
110 105
111 // Returns whether the user probably felt like they navigated somewhere new. 106 // Returns whether the user probably felt like they navigated somewhere new.
112 // We often need this logic for showing or hiding something, and this 107 // We often need this logic for showing or hiding something, and this
113 // returns true only for main frame loads that the user initiated, that go 108 // returns true only for main frame loads that the user initiated, that go
114 // to a new page. 109 // to a new page.
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 static size_t max_entry_count_; 589 static size_t max_entry_count_;
595 590
596 // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE), 591 // If a repost is pending, its type (RELOAD or RELOAD_IGNORING_CACHE),
597 // NO_RELOAD otherwise. 592 // NO_RELOAD otherwise.
598 ReloadType pending_reload_; 593 ReloadType pending_reload_;
599 594
600 DISALLOW_COPY_AND_ASSIGN(NavigationController); 595 DISALLOW_COPY_AND_ASSIGN(NavigationController);
601 }; 596 };
602 597
603 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_ 598 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | content/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698