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

Side by Side Diff: content/public/browser/navigation_controller.h

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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_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
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 // Site instance of the frame that initiated the navigation or null if we
nasko 2014/12/11 01:14:44 nit: s/Site instance/SiteInstance/
lfg 2014/12/11 23:55:24 Done.
109 // don't know it.
110 scoped_refptr<SiteInstance> source_site_instance;
111
107 // See LoadURLType comments above. 112 // See LoadURLType comments above.
108 LoadURLType load_type; 113 LoadURLType load_type;
109 114
110 // PageTransition for this load. See PageTransition for details. 115 // PageTransition for this load. See PageTransition for details.
111 // Note the default value in constructor below. 116 // Note the default value in constructor below.
112 ui::PageTransition transition_type; 117 ui::PageTransition transition_type;
113 118
114 // The FrameTreeNode ID for the frame to navigate, or -1 for the main frame. 119 // The FrameTreeNode ID for the frame to navigate, or -1 for the main frame.
115 int64 frame_tree_node_id; 120 int64 frame_tree_node_id;
116 121
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 446
442 private: 447 private:
443 // This interface should only be implemented inside content. 448 // This interface should only be implemented inside content.
444 friend class NavigationControllerImpl; 449 friend class NavigationControllerImpl;
445 NavigationController() {} 450 NavigationController() {}
446 }; 451 };
447 452
448 } // namespace content 453 } // namespace content
449 454
450 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 455 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698