OLD | NEW |
---|---|
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_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ |
6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ | 6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
14 #include "content/common/content_export.h" | 14 #include "content/common/content_export.h" |
15 #include "content/public/browser/global_request_id.h" | 15 #include "content/public/browser/global_request_id.h" |
16 #include "content/public/browser/session_storage_namespace.h" | 16 #include "content/public/browser/session_storage_namespace.h" |
17 #include "content/public/browser/site_instance.h" | |
17 #include "content/public/common/referrer.h" | 18 #include "content/public/common/referrer.h" |
18 #include "ui/base/page_transition_types.h" | 19 #include "ui/base/page_transition_types.h" |
19 #include "url/gurl.h" | 20 #include "url/gurl.h" |
20 | 21 |
21 namespace base { | 22 namespace base { |
22 | 23 |
23 class RefCountedMemory; | 24 class RefCountedMemory; |
24 | 25 |
25 } // namespace base | 26 } // namespace base |
26 | 27 |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 ui::PageTransition transition, | 98 ui::PageTransition transition, |
98 bool is_renderer_initiated, | 99 bool is_renderer_initiated, |
99 const std::string& extra_headers, | 100 const std::string& extra_headers, |
100 BrowserContext* browser_context); | 101 BrowserContext* browser_context); |
101 | 102 |
102 // Extra optional parameters for LoadURLWithParams. | 103 // Extra optional parameters for LoadURLWithParams. |
103 struct CONTENT_EXPORT LoadURLParams { | 104 struct CONTENT_EXPORT LoadURLParams { |
104 // The url to load. This field is required. | 105 // The url to load. This field is required. |
105 GURL url; | 106 GURL url; |
106 | 107 |
108 // Optional site instance that initiated the navigation. | |
109 scoped_refptr<SiteInstance> site_instance; | |
Charlie Reis
2014/11/20 19:58:43
Same issues as mentioned before.
lfg
2014/12/05 21:55:42
Done.
| |
110 | |
107 // See LoadURLType comments above. | 111 // See LoadURLType comments above. |
108 LoadURLType load_type; | 112 LoadURLType load_type; |
109 | 113 |
110 // PageTransition for this load. See PageTransition for details. | 114 // PageTransition for this load. See PageTransition for details. |
111 // Note the default value in constructor below. | 115 // Note the default value in constructor below. |
112 ui::PageTransition transition_type; | 116 ui::PageTransition transition_type; |
113 | 117 |
114 // The FrameTreeNode ID for the frame to navigate, or -1 for the main frame. | 118 // The FrameTreeNode ID for the frame to navigate, or -1 for the main frame. |
115 int64 frame_tree_node_id; | 119 int64 frame_tree_node_id; |
116 | 120 |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
441 | 445 |
442 private: | 446 private: |
443 // This interface should only be implemented inside content. | 447 // This interface should only be implemented inside content. |
444 friend class NavigationControllerImpl; | 448 friend class NavigationControllerImpl; |
445 NavigationController() {} | 449 NavigationController() {} |
446 }; | 450 }; |
447 | 451 |
448 } // namespace content | 452 } // namespace content |
449 | 453 |
450 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ | 454 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ |
OLD | NEW |