Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 | 73 |
| 74 // The disposition requested by the navigation source. Default is | 74 // The disposition requested by the navigation source. Default is |
| 75 // CURRENT_TAB. What follows is a set of coercions that happen to this value | 75 // CURRENT_TAB. What follows is a set of coercions that happen to this value |
| 76 // when other factors are at play: | 76 // when other factors are at play: |
| 77 // | 77 // |
| 78 // [in]: Condition: [out]: | 78 // [in]: Condition: [out]: |
| 79 // NEW_BACKGROUND_TAB target browser tabstrip is empty NEW_FOREGROUND_TAB | 79 // NEW_BACKGROUND_TAB target browser tabstrip is empty NEW_FOREGROUND_TAB |
| 80 // CURRENT_TAB " " " NEW_FOREGROUND_TAB | 80 // CURRENT_TAB " " " NEW_FOREGROUND_TAB |
| 81 // OFF_THE_RECORD target browser profile is incog. NEW_FOREGROUND_TAB | 81 // OFF_THE_RECORD target browser profile is incog. NEW_FOREGROUND_TAB |
| 82 // | 82 // |
| 83 // If disposition is NEW_WINDOW or NEW_POPUP, |show_window| is set to true | |
| 84 // automatically. | |
| 85 // If disposition is NEW_BACKGROUND_TAB, TabStripModel::ADD_SELECTED is | 83 // If disposition is NEW_BACKGROUND_TAB, TabStripModel::ADD_SELECTED is |
| 86 // removed from |tabstrip_add_types| automatically. | 84 // removed from |tabstrip_add_types| automatically. |
| 85 // If disposition is one of NEW_WINDOW, NEW_POPUP, NEW_FOREGROUND_TAB or | |
|
Ben Goodger (Google)
2010/11/17 15:57:50
The list of dispositions here now that coerce show
sadrul
2010/11/17 17:02:23
Done.
| |
| 86 // SINGLETON_TAB, then |show_window| is set to true and | |
| 87 // TabStripModel::ADD_SELECTED is automatically added to | |
| 88 // |tabstrip_add_types|. | |
| 87 WindowOpenDisposition disposition; | 89 WindowOpenDisposition disposition; |
| 88 | 90 |
| 89 // The transition type of the navigation. Default is PageTransition::LINK | 91 // The transition type of the navigation. Default is PageTransition::LINK |
| 90 // when target_contents is specified in the constructor. | 92 // when target_contents is specified in the constructor. |
| 91 PageTransition::Type transition; | 93 PageTransition::Type transition; |
| 92 | 94 |
| 93 // The index the caller would like the tab to be positioned at in the | 95 // The index the caller would like the tab to be positioned at in the |
| 94 // TabStrip. The actual index will be determined by the TabHandler in | 96 // TabStrip. The actual index will be determined by the TabHandler in |
| 95 // accordance with |add_types|. Defaults to -1 (allows the TabHandler to | 97 // accordance with |add_types|. Defaults to -1 (allows the TabHandler to |
| 96 // decide). | 98 // decide). |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 private: | 139 private: |
| 138 NavigateParams(); | 140 NavigateParams(); |
| 139 }; | 141 }; |
| 140 | 142 |
| 141 // Navigates according to the configuration specified in |params|. | 143 // Navigates according to the configuration specified in |params|. |
| 142 void Navigate(NavigateParams* params); | 144 void Navigate(NavigateParams* params); |
| 143 | 145 |
| 144 } // namespace browser | 146 } // namespace browser |
| 145 | 147 |
| 146 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ | 148 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ |
| OLD | NEW |