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

Unified Diff: chrome/browser/ui/browser_navigator.h

Issue 10825317: Convert banned calls to use Navigate in ash app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/app_list/search_builder.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.h
diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h
index f82c235e7742fbe898a6e8cd2620da247d45048b..70f608a56ee9ed889e1733b4a6aad892e1c32a44 100644
--- a/chrome/browser/ui/browser_navigator.h
+++ b/chrome/browser/ui/browser_navigator.h
@@ -15,6 +15,7 @@
#include "webkit/glue/window_open_disposition.h"
class Browser;
+class Profile;
class TabContents;
namespace chrome {
@@ -46,6 +47,9 @@ struct NavigateParams {
const GURL& a_url,
content::PageTransition a_transition);
NavigateParams(Browser* browser, TabContents* a_target_contents);
+ NavigateParams(Profile* profile,
+ const GURL& a_url,
+ content::PageTransition a_transition);
~NavigateParams();
// The URL/referrer to be loaded. Ignored if |target_contents| is non-NULL.
@@ -96,7 +100,8 @@ struct NavigateParams {
// constructor.
content::PageTransition transition;
- // Whether this navigation was initiated by the renderer process.
+ // Whether this navigation was initiated by the renderer process. Default is
+ // false.
bool is_renderer_initiated;
// The index the caller would like the tab to be positioned at in the
@@ -166,7 +171,8 @@ struct NavigateParams {
// [in] Specifies a Browser object where the navigation could occur or the
// tab could be added. Navigate() is not obliged to use this Browser if
- // it is not compatible with the operation being performed.
+ // it is not compatible with the operation being performed. This can be
+ // NULL, in which case |initiating_profile| must be provided.
// [out] Specifies the Browser object where the navigation occurred or the
// tab was added. Guaranteed non-NULL unless the disposition did not
// require a navigation, in which case this is set to NULL
@@ -177,6 +183,10 @@ struct NavigateParams {
// objects are deleted when the user closes a visible browser window).
Browser* browser;
+ // The profile that is initiating the navigation. If there is a non-NULL
+ // browser passed in via |browser|, it's profile will be used instead.
+ Profile* initiating_profile;
+
// Refers to a navigation that was parked in the browser in order to be
// transferred to another RVH. Only used in case of a redirection of a request
// to a different site that created a new RVH.
« no previous file with comments | « chrome/browser/ui/ash/app_list/search_builder.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698