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 "chrome/browser/ui/host_desktop.h" |
11 #include "content/public/browser/browser_context.h" | 11 #include "content/public/browser/browser_context.h" |
12 #include "content/public/browser/global_request_id.h" | 12 #include "content/public/browser/global_request_id.h" |
13 #include "content/public/common/frame_navigate_params.h" | |
13 #include "content/public/common/page_transition_types.h" | 14 #include "content/public/common/page_transition_types.h" |
14 #include "content/public/common/referrer.h" | 15 #include "content/public/common/referrer.h" |
15 #include "googleurl/src/gurl.h" | 16 #include "googleurl/src/gurl.h" |
16 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" |
17 #include "webkit/glue/window_open_disposition.h" | 18 #include "webkit/glue/window_open_disposition.h" |
18 | 19 |
19 class Browser; | 20 class Browser; |
20 class Profile; | 21 class Profile; |
21 class TabContents; | 22 class TabContents; |
23 using content::ViewMsg_Request; | |
michaeln
2012/11/02 00:08:23
please avoid the use of using declarations in .h f
irobert
2012/11/02 17:22:55
Done.
| |
22 | 24 |
23 namespace chrome { | 25 namespace chrome { |
24 | 26 |
25 // Parameters that tell Navigate() what to do. | 27 // Parameters that tell Navigate() what to do. |
26 // | 28 // |
27 // Some basic examples: | 29 // Some basic examples: |
28 // | 30 // |
29 // Simple Navigate to URL in current tab: | 31 // Simple Navigate to URL in current tab: |
30 // chrome::NavigateParams params(browser, GURL("http://www.google.com/"), | 32 // chrome::NavigateParams params(browser, GURL("http://www.google.com/"), |
31 // content::PAGE_TRANSITION_LINK); | 33 // content::PAGE_TRANSITION_LINK); |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
196 | 198 |
197 // Refers to a navigation that was parked in the browser in order to be | 199 // Refers to a navigation that was parked in the browser in order to be |
198 // transferred to another RVH. Only used in case of a redirection of a request | 200 // transferred to another RVH. Only used in case of a redirection of a request |
199 // to a different site that created a new RVH. | 201 // to a different site that created a new RVH. |
200 content::GlobalRequestID transferred_global_request_id; | 202 content::GlobalRequestID transferred_global_request_id; |
201 | 203 |
202 // Refers to which desktop this navigation should occur on. May be passed | 204 // Refers to which desktop this navigation should occur on. May be passed |
203 // explicitly or inferred from an existing Browser instance. | 205 // explicitly or inferred from an existing Browser instance. |
204 chrome::HostDesktopType host_desktop_type; | 206 chrome::HostDesktopType host_desktop_type; |
205 | 207 |
208 // request | |
209 ViewMsg_Request request; | |
michaeln
2012/11/02 00:08:23
There's some overlap between member of tha Navigat
irobert
2012/11/02 17:22:55
Yes. You are right. Since all the param structs in
| |
210 | |
206 private: | 211 private: |
207 NavigateParams(); | 212 NavigateParams(); |
208 }; | 213 }; |
209 | 214 |
210 // Navigates according to the configuration specified in |params|. | 215 // Navigates according to the configuration specified in |params|. |
211 void Navigate(NavigateParams* params); | 216 void Navigate(NavigateParams* params); |
212 | 217 |
213 // Returns true if the url is allowed to open in incognito window. | 218 // Returns true if the url is allowed to open in incognito window. |
214 bool IsURLAllowedInIncognito(const GURL& url, | 219 bool IsURLAllowedInIncognito(const GURL& url, |
215 content::BrowserContext* browser_context); | 220 content::BrowserContext* browser_context); |
216 | 221 |
217 } // namespace chrome | 222 } // namespace chrome |
218 | 223 |
219 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ | 224 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ |
OLD | NEW |