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 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 "chrome/browser/ui/host_desktop.h" |
10 #include "content/public/browser/global_request_id.h" | 11 #include "content/public/browser/global_request_id.h" |
11 #include "content/public/common/page_transition_types.h" | 12 #include "content/public/common/page_transition_types.h" |
12 #include "content/public/common/referrer.h" | 13 #include "content/public/common/referrer.h" |
13 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" |
14 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
15 #include "webkit/glue/window_open_disposition.h" | 16 #include "webkit/glue/window_open_disposition.h" |
16 | 17 |
17 class Browser; | 18 class Browser; |
18 class Profile; | 19 class Profile; |
19 class TabContents; | 20 class TabContents; |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 | 191 |
191 // The profile that is initiating the navigation. If there is a non-NULL | 192 // The profile that is initiating the navigation. If there is a non-NULL |
192 // browser passed in via |browser|, it's profile will be used instead. | 193 // browser passed in via |browser|, it's profile will be used instead. |
193 Profile* initiating_profile; | 194 Profile* initiating_profile; |
194 | 195 |
195 // Refers to a navigation that was parked in the browser in order to be | 196 // Refers to a navigation that was parked in the browser in order to be |
196 // transferred to another RVH. Only used in case of a redirection of a request | 197 // transferred to another RVH. Only used in case of a redirection of a request |
197 // to a different site that created a new RVH. | 198 // to a different site that created a new RVH. |
198 content::GlobalRequestID transferred_global_request_id; | 199 content::GlobalRequestID transferred_global_request_id; |
199 | 200 |
| 201 // Refers to which desktop this navigation should occur on. May be passed |
| 202 // explicitly or inferred from an existing Browser instance. |
| 203 chrome::HostDesktopType host_desktop_type; |
| 204 |
200 private: | 205 private: |
201 NavigateParams(); | 206 NavigateParams(); |
202 }; | 207 }; |
203 | 208 |
204 // Navigates according to the configuration specified in |params|. | 209 // Navigates according to the configuration specified in |params|. |
205 void Navigate(NavigateParams* params); | 210 void Navigate(NavigateParams* params); |
206 | 211 |
207 // Returns true if the url is allowed to open in incognito window. | 212 // Returns true if the url is allowed to open in incognito window. |
208 bool IsURLAllowedInIncognito(const GURL& url); | 213 bool IsURLAllowedInIncognito(const GURL& url); |
209 | 214 |
210 } // namespace chrome | 215 } // namespace chrome |
211 | 216 |
212 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ | 217 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ |
OLD | NEW |