| 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 |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // Show and activate the browser window after navigating. | 123 // Show and activate the browser window after navigating. |
| 124 SHOW_WINDOW, | 124 SHOW_WINDOW, |
| 125 // Show the browser window after navigating but do not activate. | 125 // Show the browser window after navigating but do not activate. |
| 126 SHOW_WINDOW_INACTIVE | 126 SHOW_WINDOW_INACTIVE |
| 127 }; | 127 }; |
| 128 // Default is NO_ACTION (don't show or activate the window). | 128 // Default is NO_ACTION (don't show or activate the window). |
| 129 // If disposition is NEW_WINDOW or NEW_POPUP, and |window_action| is set to | 129 // If disposition is NEW_WINDOW or NEW_POPUP, and |window_action| is set to |
| 130 // NO_ACTION, |window_action| will be set to SHOW_WINDOW. | 130 // NO_ACTION, |window_action| will be set to SHOW_WINDOW. |
| 131 WindowAction window_action; | 131 WindowAction window_action; |
| 132 | 132 |
| 133 // If false then the navigation was not initiated by a user gesture. |
| 134 // Default is true. |
| 135 bool user_gesture; |
| 136 |
| 133 // What to do with the path component of the URL for singleton navigations. | 137 // What to do with the path component of the URL for singleton navigations. |
| 134 enum PathBehavior { | 138 enum PathBehavior { |
| 135 // Two URLs with differing paths are different. | 139 // Two URLs with differing paths are different. |
| 136 RESPECT, | 140 RESPECT, |
| 137 // Ignore path when finding existing tab, navigate to new URL. | 141 // Ignore path when finding existing tab, navigate to new URL. |
| 138 IGNORE_AND_NAVIGATE, | 142 IGNORE_AND_NAVIGATE, |
| 139 // Ignore path when finding existing tab, don't navigate tab. | 143 // Ignore path when finding existing tab, don't navigate tab. |
| 140 IGNORE_AND_STAY_PUT, | 144 IGNORE_AND_STAY_PUT, |
| 141 }; | 145 }; |
| 142 // Default is RESPECT. | 146 // Default is RESPECT. |
| (...skipping 20 matching lines...) Expand all Loading... |
| 163 private: | 167 private: |
| 164 NavigateParams(); | 168 NavigateParams(); |
| 165 }; | 169 }; |
| 166 | 170 |
| 167 // Navigates according to the configuration specified in |params|. | 171 // Navigates according to the configuration specified in |params|. |
| 168 void Navigate(NavigateParams* params); | 172 void Navigate(NavigateParams* params); |
| 169 | 173 |
| 170 } // namespace browser | 174 } // namespace browser |
| 171 | 175 |
| 172 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ | 176 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ |
| OLD | NEW |