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

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

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 #include "content/browser/tab_contents/navigation_entry_impl.h" 5 #include "content/browser/tab_contents/navigation_entry_impl.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/browser/site_instance.h" 9 #include "content/browser/site_instance.h"
10 #include "content/public/common/content_constants.h" 10 #include "content/public/common/content_constants.h"
(...skipping 25 matching lines...) Expand all
36 36
37 NavigationEntryImpl::NavigationEntryImpl() 37 NavigationEntryImpl::NavigationEntryImpl()
38 : unique_id_(GetUniqueIDInConstructor()), 38 : unique_id_(GetUniqueIDInConstructor()),
39 site_instance_(NULL), 39 site_instance_(NULL),
40 page_type_(PAGE_TYPE_NORMAL), 40 page_type_(PAGE_TYPE_NORMAL),
41 update_virtual_url_with_url_(false), 41 update_virtual_url_with_url_(false),
42 page_id_(-1), 42 page_id_(-1),
43 transition_type_(PAGE_TRANSITION_LINK), 43 transition_type_(PAGE_TRANSITION_LINK),
44 has_post_data_(false), 44 has_post_data_(false),
45 restore_type_(RESTORE_NONE), 45 restore_type_(RESTORE_NONE),
46 is_renderer_initiated_(false) { 46 is_renderer_initiated_(false),
47 is_cross_site_reload_(false) {
47 } 48 }
48 49
49 NavigationEntryImpl::NavigationEntryImpl(SiteInstance* instance, 50 NavigationEntryImpl::NavigationEntryImpl(SiteInstance* instance,
50 int page_id, 51 int page_id,
51 const GURL& url, 52 const GURL& url,
52 const Referrer& referrer, 53 const Referrer& referrer,
53 const string16& title, 54 const string16& title,
54 PageTransition transition_type, 55 PageTransition transition_type,
55 bool is_renderer_initiated) 56 bool is_renderer_initiated)
56 : unique_id_(GetUniqueIDInConstructor()), 57 : unique_id_(GetUniqueIDInConstructor()),
57 site_instance_(instance), 58 site_instance_(instance),
58 page_type_(PAGE_TYPE_NORMAL), 59 page_type_(PAGE_TYPE_NORMAL),
59 url_(url), 60 url_(url),
60 referrer_(referrer), 61 referrer_(referrer),
61 update_virtual_url_with_url_(false), 62 update_virtual_url_with_url_(false),
62 title_(title), 63 title_(title),
63 page_id_(page_id), 64 page_id_(page_id),
64 transition_type_(transition_type), 65 transition_type_(transition_type),
65 has_post_data_(false), 66 has_post_data_(false),
66 restore_type_(RESTORE_NONE), 67 restore_type_(RESTORE_NONE),
67 is_renderer_initiated_(is_renderer_initiated) { 68 is_renderer_initiated_(is_renderer_initiated),
69 is_cross_site_reload_(false) {
68 } 70 }
69 71
70 NavigationEntryImpl::~NavigationEntryImpl() { 72 NavigationEntryImpl::~NavigationEntryImpl() {
71 } 73 }
72 74
73 int NavigationEntryImpl::GetUniqueID() const { 75 int NavigationEntryImpl::GetUniqueID() const {
74 return unique_id_; 76 return unique_id_;
75 } 77 }
76 78
77 PageType NavigationEntryImpl::GetPageType() const { 79 PageType NavigationEntryImpl::GetPageType() const {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 201
200 const SSLStatus& NavigationEntryImpl::GetSSL() const { 202 const SSLStatus& NavigationEntryImpl::GetSSL() const {
201 return ssl_; 203 return ssl_;
202 } 204 }
203 205
204 SSLStatus& NavigationEntryImpl::GetSSL() { 206 SSLStatus& NavigationEntryImpl::GetSSL() {
205 return ssl_; 207 return ssl_;
206 } 208 }
207 209
208 } // namespace content 210 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698