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 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 | 965 |
966 scoped_ptr<FullscreenController> fullscreen_controller_; | 966 scoped_ptr<FullscreenController> fullscreen_controller_; |
967 | 967 |
968 scoped_ptr<extensions::WindowController> extension_window_controller_; | 968 scoped_ptr<extensions::WindowController> extension_window_controller_; |
969 | 969 |
970 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 970 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
971 | 971 |
972 // True if the browser window has been shown at least once. | 972 // True if the browser window has been shown at least once. |
973 bool window_has_shown_; | 973 bool window_has_shown_; |
974 | 974 |
| 975 // The following factory is used for chrome update coalescing. |
| 976 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 977 |
975 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 978 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
976 | 979 |
977 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 980 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
978 | 981 |
979 // The following factory is used for chrome update coalescing. | |
980 base::WeakPtrFactory<Browser> chrome_updater_factory_; | |
981 | |
982 // The following factory is used to close the frame at a later time. | 982 // The following factory is used to close the frame at a later time. |
983 base::WeakPtrFactory<Browser> weak_factory_; | 983 base::WeakPtrFactory<Browser> weak_factory_; |
984 | 984 |
985 DISALLOW_COPY_AND_ASSIGN(Browser); | 985 DISALLOW_COPY_AND_ASSIGN(Browser); |
986 }; | 986 }; |
987 | 987 |
988 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 988 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |