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_BROWSER_NAVIGATOR_H_ | 5 #ifndef CHROME_BROWSER_BROWSER_NAVIGATOR_H_ |
6 #define CHROME_BROWSER_BROWSER_NAVIGATOR_H_ | 6 #define CHROME_BROWSER_BROWSER_NAVIGATOR_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 // remove this comment. | 111 // remove this comment. |
112 gfx::Rect window_bounds; | 112 gfx::Rect window_bounds; |
113 | 113 |
114 // True if the target window should be made visible at the end of the call | 114 // True if the target window should be made visible at the end of the call |
115 // to Navigate(). This activates the window if it was already visible. | 115 // to Navigate(). This activates the window if it was already visible. |
116 // Default is false. | 116 // Default is false. |
117 bool show_window; | 117 bool show_window; |
118 | 118 |
119 // [in] Specifies a Browser object where the navigation could occur or the | 119 // [in] Specifies a Browser object where the navigation could occur or the |
120 // tab could be added. Navigate() is not obliged to use this Browser if | 120 // tab could be added. Navigate() is not obliged to use this Browser if |
121 // it is not compatible with the operation being performed. Cannot be | 121 // it is not compatible with the operation being performed. If NULL, |
122 // NULL since Navigate() uses this Browser's Profile. | 122 // |profile| should be specified to find or create a matching Browser. |
123 // [out] Specifies the Browser object where the navigation occurred or the | 123 // [out] Specifies the Browser object where the navigation occurred or the |
124 // tab was added. Guaranteed non-NULL unless the disposition did not | 124 // tab was added. Guaranteed non-NULL unless the disposition did not |
125 // require a navigation, in which case this is set to NULL | 125 // require a navigation, in which case this is set to NULL |
126 // (SUPPRESS_OPEN, SAVE_TO_DISK, IGNORE_ACTION). | 126 // (SUPPRESS_OPEN, SAVE_TO_DISK, IGNORE_ACTION). |
127 // Note: If |show_window| is set to false and a new Browser is created by | 127 // Note: If |show_window| is set to false and a new Browser is created by |
128 // Navigate(), the caller is responsible for showing it so that its | 128 // Navigate(), the caller is responsible for showing it so that its |
129 // window can assume responsibility for the Browser's lifetime (Browser | 129 // window can assume responsibility for the Browser's lifetime (Browser |
130 // objects are deleted when the user closes a visible browser window). | 130 // objects are deleted when the user closes a visible browser window). |
131 Browser* browser; | 131 Browser* browser; |
132 | 132 |
| 133 // If |browser| == NULL, specifies a Profile to use when finding or |
| 134 // creating a Browser. |
| 135 Profile* profile; |
| 136 |
133 private: | 137 private: |
134 NavigateParams(); | 138 NavigateParams(); |
135 }; | 139 }; |
136 | 140 |
137 // Navigates according to the configuration specified in |params|. | 141 // Navigates according to the configuration specified in |params|. |
138 void Navigate(NavigateParams* params); | 142 void Navigate(NavigateParams* params); |
139 | 143 |
140 } // namespace browser | 144 } // namespace browser |
141 | 145 |
142 #endif // CHROME_BROWSER_BROWSER_NAVIGATOR_H_ | 146 #endif // CHROME_BROWSER_BROWSER_NAVIGATOR_H_ |
143 | |
OLD | NEW |