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

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

Issue 9169065: Reloading page after installing app should bring it into correct process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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_IMPL_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 void set_transferred_global_request_id( 137 void set_transferred_global_request_id(
138 const GlobalRequestID& transferred_global_request_id) { 138 const GlobalRequestID& transferred_global_request_id) {
139 transferred_global_request_id_ = transferred_global_request_id; 139 transferred_global_request_id_ = transferred_global_request_id;
140 } 140 }
141 141
142 GlobalRequestID transferred_global_request_id() const { 142 GlobalRequestID transferred_global_request_id() const {
143 return transferred_global_request_id_; 143 return transferred_global_request_id_;
144 } 144 }
145 145
146 void set_is_cross_site_reload(bool is_cross_site_reload) {
Charlie Reis 2012/01/26 01:20:23 Let's add a comment here.
nasko 2012/01/26 20:25:57 Done.
147 is_cross_site_reload_ = is_cross_site_reload;
148 }
149 bool is_cross_site_reload() const {
150 return is_cross_site_reload_;
151 }
152
146 private: 153 private:
147 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 154 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
148 // Session/Tab restore save portions of this class so that it can be recreated 155 // Session/Tab restore save portions of this class so that it can be recreated
149 // later. If you add a new field that needs to be persisted you'll have to 156 // later. If you add a new field that needs to be persisted you'll have to
150 // update SessionService/TabRestoreService appropriately. 157 // update SessionService/TabRestoreService appropriately.
151 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 158 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
152 159
153 // See the accessors above for descriptions. 160 // See the accessors above for descriptions.
154 int unique_id_; 161 int unique_id_;
155 scoped_refptr<SiteInstance> site_instance_; 162 scoped_refptr<SiteInstance> site_instance_;
(...skipping 28 matching lines...) Expand all
184 191
185 // In case a navigation is transferred to a new RVH but the request has 192 // In case a navigation is transferred to a new RVH but the request has
186 // been generated in the renderer already, this identifies the old request so 193 // been generated in the renderer already, this identifies the old request so
187 // that it can be resumed. The old request is stored until the 194 // that it can be resumed. The old request is stored until the
188 // ResourceDispatcher receives the navigation from the renderer which 195 // ResourceDispatcher receives the navigation from the renderer which
189 // carries this |transferred_global_request_id_| annotation. Once the request 196 // carries this |transferred_global_request_id_| annotation. Once the request
190 // is transferred to the new process, this is cleared and the request 197 // is transferred to the new process, this is cleared and the request
191 // continues as normal. 198 // continues as normal.
192 GlobalRequestID transferred_global_request_id_; 199 GlobalRequestID transferred_global_request_id_;
193 200
201 // This indicates whether this entry is being reloaded, but due to changes in
202 // site instances, it has to be reloaded in a different site instance. In
Charlie Reis 2012/01/26 01:20:23 This sentence is a bit awkward. Maybe the first "
nasko 2012/01/26 20:25:57 Done.
203 // such case, we must treat it as an existing navigation in the new site
204 // instance, instead of a new navigation.
205 bool is_cross_site_reload_;
206
194 // Copy and assignment is explicitly allowed for this class. 207 // Copy and assignment is explicitly allowed for this class.
195 }; 208 };
196 209
197 } // namespace content 210 } // namespace content
198 211
199 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 212 #endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698