| OLD | NEW |
| 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 CHROME_BROWSER_UI_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 // The bounds of the window to open. | 183 // The bounds of the window to open. |
| 184 gfx::Rect initial_bounds; | 184 gfx::Rect initial_bounds; |
| 185 | 185 |
| 186 // The workspace the window should open in, if the platform supports it. | 186 // The workspace the window should open in, if the platform supports it. |
| 187 std::string initial_workspace; | 187 std::string initial_workspace; |
| 188 | 188 |
| 189 ui::WindowShowState initial_show_state; | 189 ui::WindowShowState initial_show_state; |
| 190 | 190 |
| 191 bool is_session_restore; | 191 bool is_session_restore; |
| 192 | 192 |
| 193 // Skip session restoration. |
| 194 bool dont_restore = false; |
| 195 |
| 193 // Supply a custom BrowserWindow implementation, to be used instead of the | 196 // Supply a custom BrowserWindow implementation, to be used instead of the |
| 194 // default. Intended for testing. | 197 // default. Intended for testing. |
| 195 BrowserWindow* window; | 198 BrowserWindow* window; |
| 196 | 199 |
| 197 private: | 200 private: |
| 198 friend class Browser; | 201 friend class Browser; |
| 199 | 202 |
| 200 // The application name that is also the name of the window to the shell. | 203 // The application name that is also the name of the window to the shell. |
| 201 // Do not set this value directly, use CreateForApp. | 204 // Do not set this value directly, use CreateForApp. |
| 202 // This name will be set for: | 205 // This name will be set for: |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1002 // The following factory is used for chrome update coalescing. | 1005 // The following factory is used for chrome update coalescing. |
| 1003 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1006 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1004 | 1007 |
| 1005 // The following factory is used to close the frame at a later time. | 1008 // The following factory is used to close the frame at a later time. |
| 1006 base::WeakPtrFactory<Browser> weak_factory_; | 1009 base::WeakPtrFactory<Browser> weak_factory_; |
| 1007 | 1010 |
| 1008 DISALLOW_COPY_AND_ASSIGN(Browser); | 1011 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1009 }; | 1012 }; |
| 1010 | 1013 |
| 1011 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1014 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |