OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
| 11 #include "content/browser/renderer_host/global_request_id.h" |
11 #include "content/public/common/page_transition_types.h" | 12 #include "content/public/common/page_transition_types.h" |
12 #include "googleurl/src/gurl.h" | 13 #include "googleurl/src/gurl.h" |
13 #include "ui/gfx/rect.h" | 14 #include "ui/gfx/rect.h" |
14 #include "webkit/glue/window_open_disposition.h" | 15 #include "webkit/glue/window_open_disposition.h" |
15 | 16 |
16 class Browser; | 17 class Browser; |
17 class Profile; | 18 class Profile; |
18 class TabContentsWrapper; | 19 class TabContentsWrapper; |
19 | 20 |
20 namespace browser { | 21 namespace browser { |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 // Note: If |show_window| is set to false and a new Browser is created by | 174 // Note: If |show_window| is set to false and a new Browser is created by |
174 // Navigate(), the caller is responsible for showing it so that its | 175 // Navigate(), the caller is responsible for showing it so that its |
175 // window can assume responsibility for the Browser's lifetime (Browser | 176 // window can assume responsibility for the Browser's lifetime (Browser |
176 // objects are deleted when the user closes a visible browser window). | 177 // objects are deleted when the user closes a visible browser window). |
177 Browser* browser; | 178 Browser* browser; |
178 | 179 |
179 // If |browser| == NULL, specifies a Profile to use when finding or | 180 // If |browser| == NULL, specifies a Profile to use when finding or |
180 // creating a Browser. | 181 // creating a Browser. |
181 Profile* profile; | 182 Profile* profile; |
182 | 183 |
| 184 // Refers to a navigation that was parked in the browser in order to be |
| 185 // transferred to another RVH. Only used in case of a redirection of a request |
| 186 // to a different site that created a new RVH. |
| 187 GlobalRequestID transferred_global_request_id; |
| 188 |
183 private: | 189 private: |
184 NavigateParams(); | 190 NavigateParams(); |
185 }; | 191 }; |
186 | 192 |
187 // Navigates according to the configuration specified in |params|. | 193 // Navigates according to the configuration specified in |params|. |
188 void Navigate(NavigateParams* params); | 194 void Navigate(NavigateParams* params); |
189 | 195 |
190 // If the given navigational URL is a Singleton, return the tab index for it. | 196 // If the given navigational URL is a Singleton, return the tab index for it. |
191 // Otherwise, returns -1. | 197 // Otherwise, returns -1. |
192 int GetIndexOfSingletonTab(NavigateParams* params); | 198 int GetIndexOfSingletonTab(NavigateParams* params); |
193 | 199 |
194 // Returns true if the url is allowed to open in incognito window. | 200 // Returns true if the url is allowed to open in incognito window. |
195 bool IsURLAllowedInIncognito(const GURL& url); | 201 bool IsURLAllowedInIncognito(const GURL& url); |
196 | 202 |
197 } // namespace browser | 203 } // namespace browser |
198 | 204 |
199 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ | 205 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ |
OLD | NEW |