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

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: Fixing merge conflict. Created 8 years, 10 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
« no previous file with comments | « content/browser/tab_contents/navigation_entry_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/public/common/content_constants.h" 9 #include "content/public/common/content_constants.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 26 matching lines...) Expand all
37 37
38 NavigationEntryImpl::NavigationEntryImpl() 38 NavigationEntryImpl::NavigationEntryImpl()
39 : unique_id_(GetUniqueIDInConstructor()), 39 : unique_id_(GetUniqueIDInConstructor()),
40 site_instance_(NULL), 40 site_instance_(NULL),
41 page_type_(PAGE_TYPE_NORMAL), 41 page_type_(PAGE_TYPE_NORMAL),
42 update_virtual_url_with_url_(false), 42 update_virtual_url_with_url_(false),
43 page_id_(-1), 43 page_id_(-1),
44 transition_type_(PAGE_TRANSITION_LINK), 44 transition_type_(PAGE_TRANSITION_LINK),
45 has_post_data_(false), 45 has_post_data_(false),
46 restore_type_(RESTORE_NONE), 46 restore_type_(RESTORE_NONE),
47 is_renderer_initiated_(false) { 47 is_renderer_initiated_(false),
48 is_cross_site_reload_(false) {
48 } 49 }
49 50
50 NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance, 51 NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
51 int page_id, 52 int page_id,
52 const GURL& url, 53 const GURL& url,
53 const Referrer& referrer, 54 const Referrer& referrer,
54 const string16& title, 55 const string16& title,
55 PageTransition transition_type, 56 PageTransition transition_type,
56 bool is_renderer_initiated) 57 bool is_renderer_initiated)
57 : unique_id_(GetUniqueIDInConstructor()), 58 : unique_id_(GetUniqueIDInConstructor()),
58 site_instance_(instance), 59 site_instance_(instance),
59 page_type_(PAGE_TYPE_NORMAL), 60 page_type_(PAGE_TYPE_NORMAL),
60 url_(url), 61 url_(url),
61 referrer_(referrer), 62 referrer_(referrer),
62 update_virtual_url_with_url_(false), 63 update_virtual_url_with_url_(false),
63 title_(title), 64 title_(title),
64 page_id_(page_id), 65 page_id_(page_id),
65 transition_type_(transition_type), 66 transition_type_(transition_type),
66 has_post_data_(false), 67 has_post_data_(false),
67 restore_type_(RESTORE_NONE), 68 restore_type_(RESTORE_NONE),
68 is_renderer_initiated_(is_renderer_initiated) { 69 is_renderer_initiated_(is_renderer_initiated),
70 is_cross_site_reload_(false) {
69 } 71 }
70 72
71 NavigationEntryImpl::~NavigationEntryImpl() { 73 NavigationEntryImpl::~NavigationEntryImpl() {
72 } 74 }
73 75
74 int NavigationEntryImpl::GetUniqueID() const { 76 int NavigationEntryImpl::GetUniqueID() const {
75 return unique_id_; 77 return unique_id_;
76 } 78 }
77 79
78 PageType NavigationEntryImpl::GetPageType() const { 80 PageType NavigationEntryImpl::GetPageType() const {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 202
201 const SSLStatus& NavigationEntryImpl::GetSSL() const { 203 const SSLStatus& NavigationEntryImpl::GetSSL() const {
202 return ssl_; 204 return ssl_;
203 } 205 }
204 206
205 SSLStatus& NavigationEntryImpl::GetSSL() { 207 SSLStatus& NavigationEntryImpl::GetSSL() {
206 return ssl_; 208 return ssl_;
207 } 209 }
208 210
209 } // namespace content 211 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/tab_contents/navigation_entry_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698