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 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 891 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
892 | 892 |
893 // Helper which implements the SyncedWindowDelegate interface. | 893 // Helper which implements the SyncedWindowDelegate interface. |
894 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; | 894 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; |
895 | 895 |
896 scoped_ptr<chrome::BrowserInstantController> instant_controller_; | 896 scoped_ptr<chrome::BrowserInstantController> instant_controller_; |
897 | 897 |
898 BookmarkBar::State bookmark_bar_state_; | 898 BookmarkBar::State bookmark_bar_state_; |
899 DeviceAttachedIntentSource device_attached_intent_source_; | 899 DeviceAttachedIntentSource device_attached_intent_source_; |
900 | 900 |
901 scoped_refptr<FullscreenController> fullscreen_controller_; | 901 scoped_ptr<FullscreenController> fullscreen_controller_; |
902 | 902 |
903 scoped_ptr<extensions::WindowController> extension_window_controller_; | 903 scoped_ptr<extensions::WindowController> extension_window_controller_; |
904 | 904 |
905 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 905 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
906 | 906 |
907 // True if the browser window has been shown at least once. | 907 // True if the browser window has been shown at least once. |
908 bool window_has_shown_; | 908 bool window_has_shown_; |
909 | 909 |
910 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 910 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
911 // before DidEndColorChooser is called. | 911 // before DidEndColorChooser is called. |
912 scoped_ptr<content::ColorChooser> color_chooser_; | 912 scoped_ptr<content::ColorChooser> color_chooser_; |
913 | 913 |
914 DISALLOW_COPY_AND_ASSIGN(Browser); | 914 DISALLOW_COPY_AND_ASSIGN(Browser); |
915 }; | 915 }; |
916 | 916 |
917 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 917 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |