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

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

Issue 834133004: Don't initialize C++ constants in Java during JNI registration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: multi-line package name yet again Created 5 years, 11 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
« no previous file with comments | « content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28 matching lines...) Expand all
39 class NavigationController { 39 class NavigationController {
40 public: 40 public:
41 enum ReloadType { 41 enum ReloadType {
42 NO_RELOAD, // Normal load. 42 NO_RELOAD, // Normal load.
43 RELOAD, // Normal (cache-validating) reload. 43 RELOAD, // Normal (cache-validating) reload.
44 RELOAD_IGNORING_CACHE, // Reload bypassing the cache (shift-reload). 44 RELOAD_IGNORING_CACHE, // Reload bypassing the cache (shift-reload).
45 RELOAD_ORIGINAL_REQUEST_URL // Reload using the original request URL. 45 RELOAD_ORIGINAL_REQUEST_URL // Reload using the original request URL.
46 }; 46 };
47 47
48 // Load type used in LoadURLParams. 48 // Load type used in LoadURLParams.
49 //
50 // A Java counterpart will be generated for this enum.
51 // GENERATED_JAVA_ENUM_PACKAGE: (
52 // org.chromium.content_public.browser.navigation_controller)
53 // GENERATED_JAVA_PREFIX_TO_STRIP: LOAD_TYPE_
49 enum LoadURLType { 54 enum LoadURLType {
50 // For loads that do not fall into any types below. 55 // For loads that do not fall into any types below.
51 LOAD_TYPE_DEFAULT, 56 LOAD_TYPE_DEFAULT,
52 57
53 // An http post load request initiated from browser side. 58 // An http post load request initiated from browser side.
54 // The post data is passed in |browser_initiated_post_data|. 59 // The post data is passed in |browser_initiated_post_data|.
55 LOAD_TYPE_BROWSER_INITIATED_HTTP_POST, 60 LOAD_TYPE_BROWSER_INITIATED_HTTP_POST,
56 61
57 // Loads a 'data:' scheme URL with specified base URL and a history entry 62 // Loads a 'data:' scheme URL with specified base URL and a history entry
58 // URL. This is only safe to be used for browser-initiated data: URL 63 // URL. This is only safe to be used for browser-initiated data: URL
59 // navigations, since it shows arbitrary content as if it comes from 64 // navigations, since it shows arbitrary content as if it comes from
60 // |virtual_url_for_data_url|. 65 // |virtual_url_for_data_url|.
61 LOAD_TYPE_DATA 66 LOAD_TYPE_DATA
62 67
63 // Adding new LoadURLType? Also update LoadUrlParams.java static constants. 68 // Adding new LoadURLType? Also update LoadUrlParams.java static constants.
64 }; 69 };
65 70
66 // User agent override type used in LoadURLParams. 71 // User agent override type used in LoadURLParams.
72 //
73 // A Java counterpart will be generated for this enum.
74 // GENERATED_JAVA_ENUM_PACKAGE: (
75 // org.chromium.content_public.browser.navigation_controller)
76 // GENERATED_JAVA_PREFIX_TO_STRIP: UA_OVERRIDE_
67 enum UserAgentOverrideOption { 77 enum UserAgentOverrideOption {
68 // Use the override value from the previous NavigationEntry in the 78 // Use the override value from the previous NavigationEntry in the
69 // NavigationController. 79 // NavigationController.
70 UA_OVERRIDE_INHERIT, 80 UA_OVERRIDE_INHERIT,
71 81
72 // Use the default user agent. 82 // Use the default user agent.
73 UA_OVERRIDE_FALSE, 83 UA_OVERRIDE_FALSE,
74 84
75 // Use the user agent override, if it's available. 85 // Use the user agent override, if it's available.
76 UA_OVERRIDE_TRUE 86 UA_OVERRIDE_TRUE
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 456
447 private: 457 private:
448 // This interface should only be implemented inside content. 458 // This interface should only be implemented inside content.
449 friend class NavigationControllerImpl; 459 friend class NavigationControllerImpl;
450 NavigationController() {} 460 NavigationController() {}
451 }; 461 };
452 462
453 } // namespace content 463 } // namespace content
454 464
455 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 465 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698