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

Side by Side Diff: content/public/browser/navigation_controller.h

Issue 10823207: Consolidate ContentViewCore::Load* functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@cleanup_load
Patch Set: address Charlie's comments 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 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 CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 // An http post load request initiated from browser side. 57 // An http post load request initiated from browser side.
58 // The post data is passed in |browser_initiated_post_data|. 58 // The post data is passed in |browser_initiated_post_data|.
59 LOAD_TYPE_BROWSER_INITIATED_HTTP_POST, 59 LOAD_TYPE_BROWSER_INITIATED_HTTP_POST,
60 60
61 // Loads a 'data:' scheme URL with specified base URL and a history entry 61 // Loads a 'data:' scheme URL with specified base URL and a history entry
62 // URL. This is only safe to be used for browser-initiated data: URL 62 // URL. This is only safe to be used for browser-initiated data: URL
63 // navigations, since it shows arbitrary content as if it comes from 63 // navigations, since it shows arbitrary content as if it comes from
64 // |virtual_url_for_data_url|. 64 // |virtual_url_for_data_url|.
65 LOAD_TYPE_DATA 65 LOAD_TYPE_DATA
66
67 // Adding new LoadURLType? Also update LoadUrlParams.java static constants.
66 }; 68 };
67 69
68 // User agent override type used in LoadURLParams. 70 // User agent override type used in LoadURLParams.
69 enum UserAgentOverrideOption { 71 enum UserAgentOverrideOption {
70 // Use the override value from the previous NavigationEntry in the 72 // Use the override value from the previous NavigationEntry in the
71 // NavigationController. 73 // NavigationController.
72 UA_OVERRIDE_INHERIT, 74 UA_OVERRIDE_INHERIT,
73 75
74 // Use the default user agent. 76 // Use the default user agent.
75 UA_OVERRIDE_FALSE, 77 UA_OVERRIDE_FALSE,
76 78
77 // Use the user agent override, if it's available. 79 // Use the user agent override, if it's available.
78 UA_OVERRIDE_TRUE 80 UA_OVERRIDE_TRUE
81
82 // Adding new UserAgentOverrideOption? Also update LoadUrlParams.java
83 // static constants.
79 }; 84 };
80 85
81 // Creates a navigation entry and translates the virtual url to a real one. 86 // Creates a navigation entry and translates the virtual url to a real one.
82 // This is a general call; prefer LoadURL[FromRenderer]/TransferURL below. 87 // This is a general call; prefer LoadURL[FromRenderer]/TransferURL below.
83 // Extra headers are separated by \n. 88 // Extra headers are separated by \n.
84 CONTENT_EXPORT static NavigationEntry* CreateNavigationEntry( 89 CONTENT_EXPORT static NavigationEntry* CreateNavigationEntry(
85 const GURL& url, 90 const GURL& url,
86 const Referrer& referrer, 91 const Referrer& referrer,
87 PageTransition transition, 92 PageTransition transition,
88 bool is_renderer_initiated, 93 bool is_renderer_initiated,
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 virtual void CopyStateFromAndPrune(NavigationController* source) = 0; 348 virtual void CopyStateFromAndPrune(NavigationController* source) = 0;
344 349
345 // Removes all the entries except the active entry. If there is a new pending 350 // Removes all the entries except the active entry. If there is a new pending
346 // navigation it is preserved. 351 // navigation it is preserved.
347 virtual void PruneAllButActive() = 0; 352 virtual void PruneAllButActive() = 0;
348 }; 353 };
349 354
350 } // namespace content 355 } // namespace content
351 356
352 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 357 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698