| 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 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 | 995 |
| 996 std::unique_ptr<ExclusiveAccessManager> exclusive_access_manager_; | 996 std::unique_ptr<ExclusiveAccessManager> exclusive_access_manager_; |
| 997 | 997 |
| 998 std::unique_ptr<extensions::WindowController> extension_window_controller_; | 998 std::unique_ptr<extensions::WindowController> extension_window_controller_; |
| 999 | 999 |
| 1000 std::unique_ptr<chrome::BrowserCommandController> command_controller_; | 1000 std::unique_ptr<chrome::BrowserCommandController> command_controller_; |
| 1001 | 1001 |
| 1002 // True if the browser window has been shown at least once. | 1002 // True if the browser window has been shown at least once. |
| 1003 bool window_has_shown_; | 1003 bool window_has_shown_; |
| 1004 | 1004 |
| 1005 std::unique_ptr<ValidationMessageBubble> validation_message_bubble_; | 1005 base::WeakPtr<ValidationMessageBubble> validation_message_bubble_; |
| 1006 | 1006 |
| 1007 SigninViewController signin_view_controller_; | 1007 SigninViewController signin_view_controller_; |
| 1008 | 1008 |
| 1009 std::unique_ptr<ScopedKeepAlive> keep_alive_; | 1009 std::unique_ptr<ScopedKeepAlive> keep_alive_; |
| 1010 | 1010 |
| 1011 // The following factory is used for chrome update coalescing. | 1011 // The following factory is used for chrome update coalescing. |
| 1012 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1012 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1013 | 1013 |
| 1014 // The following factory is used to close the frame at a later time. | 1014 // The following factory is used to close the frame at a later time. |
| 1015 base::WeakPtrFactory<Browser> weak_factory_; | 1015 base::WeakPtrFactory<Browser> weak_factory_; |
| 1016 | 1016 |
| 1017 DISALLOW_COPY_AND_ASSIGN(Browser); | 1017 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1018 }; | 1018 }; |
| 1019 | 1019 |
| 1020 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1020 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |