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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
95 public InstantDelegate { | 95 public InstantDelegate { |
96 public: | 96 public: |
97 // SessionService::WindowType mirrors these values. If you add to this | 97 // SessionService::WindowType mirrors these values. If you add to this |
98 // enum, look at SessionService::WindowType to see if it needs to be | 98 // enum, look at SessionService::WindowType to see if it needs to be |
99 // updated. | 99 // updated. |
100 enum Type { | 100 enum Type { |
101 // If you add a new type, consider updating the test | 101 // If you add a new type, consider updating the test |
102 // BrowserTest.StartMaximized. | 102 // BrowserTest.StartMaximized. |
103 TYPE_TABBED = 1, | 103 TYPE_TABBED = 1, |
104 TYPE_POPUP = 2, | 104 TYPE_POPUP = 2, |
105 TYPE_PANEL = 3 | 105 TYPE_PANEL = 3, |
106 #if defined(USE_AURA) | |
107 TYPE_APP = 4 | |
sky
2012/02/09 01:04:17
Did you talk with the extension guys to make sure
DaveMoore
2012/02/10 23:05:55
I've added it to session restore
On 2012/02/09 01:
| |
108 #endif | |
106 }; | 109 }; |
107 | 110 |
108 // Possible elements of the Browser window. | 111 // Possible elements of the Browser window. |
109 enum WindowFeature { | 112 enum WindowFeature { |
110 FEATURE_NONE = 0, | 113 FEATURE_NONE = 0, |
111 FEATURE_TITLEBAR = 1, | 114 FEATURE_TITLEBAR = 1, |
112 FEATURE_TABSTRIP = 2, | 115 FEATURE_TABSTRIP = 2, |
113 FEATURE_TOOLBAR = 4, | 116 FEATURE_TOOLBAR = 4, |
114 FEATURE_LOCATIONBAR = 8, | 117 FEATURE_LOCATIONBAR = 8, |
115 FEATURE_BOOKMARKBAR = 16, | 118 FEATURE_BOOKMARKBAR = 16, |
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1445 | 1448 |
1446 scoped_refptr<FullscreenController> fullscreen_controller_; | 1449 scoped_refptr<FullscreenController> fullscreen_controller_; |
1447 | 1450 |
1448 // True if the browser window has been shown at least once. | 1451 // True if the browser window has been shown at least once. |
1449 bool window_has_shown_; | 1452 bool window_has_shown_; |
1450 | 1453 |
1451 DISALLOW_COPY_AND_ASSIGN(Browser); | 1454 DISALLOW_COPY_AND_ASSIGN(Browser); |
1452 }; | 1455 }; |
1453 | 1456 |
1454 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1457 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |