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

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

Issue 12052023: Add "frame to navigate" to NavigationEntry and plumb it to the RenderViewImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 virtual const SSLStatus& GetSSL() const OVERRIDE; 66 virtual const SSLStatus& GetSSL() const OVERRIDE;
67 virtual SSLStatus& GetSSL() OVERRIDE; 67 virtual SSLStatus& GetSSL() OVERRIDE;
68 virtual void SetOriginalRequestURL(const GURL& original_url) OVERRIDE; 68 virtual void SetOriginalRequestURL(const GURL& original_url) OVERRIDE;
69 virtual const GURL& GetOriginalRequestURL() const OVERRIDE; 69 virtual const GURL& GetOriginalRequestURL() const OVERRIDE;
70 virtual void SetIsOverridingUserAgent(bool override) OVERRIDE; 70 virtual void SetIsOverridingUserAgent(bool override) OVERRIDE;
71 virtual bool GetIsOverridingUserAgent() const OVERRIDE; 71 virtual bool GetIsOverridingUserAgent() const OVERRIDE;
72 virtual void SetTimestamp(base::Time timestamp) OVERRIDE; 72 virtual void SetTimestamp(base::Time timestamp) OVERRIDE;
73 virtual base::Time GetTimestamp() const OVERRIDE; 73 virtual base::Time GetTimestamp() const OVERRIDE;
74 virtual void SetCanLoadLocalResources(bool allow) OVERRIDE; 74 virtual void SetCanLoadLocalResources(bool allow) OVERRIDE;
75 virtual bool GetCanLoadLocalResources() const OVERRIDE; 75 virtual bool GetCanLoadLocalResources() const OVERRIDE;
76 virtual void SetFrameToNavigate(const std::string& frame_name) OVERRIDE;
77 virtual const std::string& GetFrameToNavigate() const OVERRIDE;
76 78
77 void set_unique_id(int unique_id) { 79 void set_unique_id(int unique_id) {
78 unique_id_ = unique_id; 80 unique_id_ = unique_id;
79 } 81 }
80 82
81 // The SiteInstance tells us how to share sub-processes. This is a reference 83 // The SiteInstance tells us how to share sub-processes. This is a reference
82 // counted pointer to a shared site instance. 84 // counted pointer to a shared site instance.
83 // 85 //
84 // Note that the SiteInstance should usually not be changed after it is set, 86 // Note that the SiteInstance should usually not be changed after it is set,
85 // but this may happen if the NavigationEntry was cloned and needs to use a 87 // but this may happen if the NavigationEntry was cloned and needs to use a
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // 254 //
253 // We also use this flag for cross-process redirect navigations, so that the 255 // We also use this flag for cross-process redirect navigations, so that the
254 // browser will replace the current navigation entry (which is the page 256 // browser will replace the current navigation entry (which is the page
255 // doing the redirect). 257 // doing the redirect).
256 bool should_replace_entry_; 258 bool should_replace_entry_;
257 259
258 // Set when this entry should be able to access local file:// resources. This 260 // Set when this entry should be able to access local file:// resources. This
259 // value is not needed after the entry commits and is not persisted. 261 // value is not needed after the entry commits and is not persisted.
260 bool can_load_local_resources_; 262 bool can_load_local_resources_;
261 263
264 // If not empty, the name of the frame to navigate. This field is not
265 // persisted, because it is currently only used in tests.
266 std::string frame_to_navigate_;
267
262 // Copy and assignment is explicitly allowed for this class. 268 // Copy and assignment is explicitly allowed for this class.
263 }; 269 };
264 270
265 } // namespace content 271 } // namespace content
266 272
267 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_ 273 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_ENTRY_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_types.cc ('k') | content/browser/web_contents/navigation_entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698