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 <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
953 | 953 |
954 scoped_ptr<FullscreenController> fullscreen_controller_; | 954 scoped_ptr<FullscreenController> fullscreen_controller_; |
955 | 955 |
956 scoped_ptr<extensions::WindowController> extension_window_controller_; | 956 scoped_ptr<extensions::WindowController> extension_window_controller_; |
957 | 957 |
958 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 958 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
959 | 959 |
960 // True if the browser window has been shown at least once. | 960 // True if the browser window has been shown at least once. |
961 bool window_has_shown_; | 961 bool window_has_shown_; |
962 | 962 |
963 // The following factory is used for chrome update coalescing. | |
964 base::WeakPtrFactory<Browser> chrome_updater_factory_; | |
965 | |
966 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 963 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
967 | 964 |
968 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 965 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
969 | 966 |
| 967 // The following factory is used for chrome update coalescing. |
| 968 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 969 |
970 // The following factory is used to close the frame at a later time. | 970 // The following factory is used to close the frame at a later time. |
971 base::WeakPtrFactory<Browser> weak_factory_; | 971 base::WeakPtrFactory<Browser> weak_factory_; |
972 | 972 |
973 DISALLOW_COPY_AND_ASSIGN(Browser); | 973 DISALLOW_COPY_AND_ASSIGN(Browser); |
974 }; | 974 }; |
975 | 975 |
976 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 976 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |