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

Side by Side Diff: chrome/browser/ui/browser_navigator.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 CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
6 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ 6 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/ref_counted_memory.h" 11 #include "base/memory/ref_counted_memory.h"
12 #include "chrome/browser/ui/host_desktop.h" 12 #include "chrome/browser/ui/host_desktop.h"
13 #include "content/public/browser/browser_context.h" 13 #include "content/public/browser/browser_context.h"
14 #include "content/public/browser/global_request_id.h" 14 #include "content/public/browser/global_request_id.h"
15 #include "content/public/browser/page_navigator.h" 15 #include "content/public/browser/page_navigator.h"
16 #include "content/public/browser/site_instance.h"
16 #include "content/public/common/referrer.h" 17 #include "content/public/common/referrer.h"
17 #include "ui/base/page_transition_types.h" 18 #include "ui/base/page_transition_types.h"
18 #include "ui/base/window_open_disposition.h" 19 #include "ui/base/window_open_disposition.h"
19 #include "ui/gfx/rect.h" 20 #include "ui/gfx/rect.h"
20 #include "url/gurl.h" 21 #include "url/gurl.h"
21 22
22 class Browser; 23 class Browser;
23 class Profile; 24 class Profile;
24 25
25 namespace content { 26 namespace content {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 content::WebContents* a_target_contents); 59 content::WebContents* a_target_contents);
59 NavigateParams(Profile* profile, 60 NavigateParams(Profile* profile,
60 const GURL& a_url, 61 const GURL& a_url,
61 ui::PageTransition a_transition); 62 ui::PageTransition a_transition);
62 ~NavigateParams(); 63 ~NavigateParams();
63 64
64 // The URL/referrer to be loaded. Ignored if |target_contents| is non-NULL. 65 // The URL/referrer to be loaded. Ignored if |target_contents| is non-NULL.
65 GURL url; 66 GURL url;
66 content::Referrer referrer; 67 content::Referrer referrer;
67 68
69 // Site instance that initiated the navigation. Should only be used when a
70 // cross-site navigation is initiated by a remote frame.
Charlie Reis 2014/12/06 00:18:50 Why? It may only matter in that case for now, but
lfg 2014/12/08 20:45:32 Done.
71 scoped_refptr<content::SiteInstance> source_site_instance;
72
68 // The browser-global ID of the frame to navigate, or -1 for the main frame. 73 // The browser-global ID of the frame to navigate, or -1 for the main frame.
69 int64 frame_tree_node_id; 74 int64 frame_tree_node_id;
70 75
71 // Any redirect URLs that occurred for this navigation before |url|. 76 // Any redirect URLs that occurred for this navigation before |url|.
72 // Usually empty. 77 // Usually empty.
73 std::vector<GURL> redirect_chain; 78 std::vector<GURL> redirect_chain;
74 79
75 // Indicates whether this navigation will be sent using POST. 80 // Indicates whether this navigation will be sent using POST.
76 // The POST method is limited support for basic POST data by leveraging 81 // The POST method is limited support for basic POST data by leveraging
77 // NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST. 82 // NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST.
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // Navigates according to the configuration specified in |params|. 250 // Navigates according to the configuration specified in |params|.
246 void Navigate(NavigateParams* params); 251 void Navigate(NavigateParams* params);
247 252
248 // Returns true if the url is allowed to open in incognito window. 253 // Returns true if the url is allowed to open in incognito window.
249 bool IsURLAllowedInIncognito(const GURL& url, 254 bool IsURLAllowedInIncognito(const GURL& url,
250 content::BrowserContext* browser_context); 255 content::BrowserContext* browser_context);
251 256
252 } // namespace chrome 257 } // namespace chrome
253 258
254 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ 259 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_navigator.cc » ('j') | content/browser/frame_host/navigation_entry_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698