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 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 // Helper which implements the TabRestoreServiceDelegate interface. | 901 // Helper which implements the TabRestoreServiceDelegate interface. |
902 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 902 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
903 | 903 |
904 // Helper which implements the SyncedWindowDelegate interface. | 904 // Helper which implements the SyncedWindowDelegate interface. |
905 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; | 905 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; |
906 | 906 |
907 scoped_ptr<chrome::BrowserInstantController> instant_controller_; | 907 scoped_ptr<chrome::BrowserInstantController> instant_controller_; |
908 | 908 |
909 BookmarkBar::State bookmark_bar_state_; | 909 BookmarkBar::State bookmark_bar_state_; |
910 | 910 |
| 911 #if 0 |
| 912 // Device attach web intent is disabled for M22. See crbug.com/144326. |
911 scoped_ptr<DeviceAttachedIntentSource> device_attached_intent_source_; | 913 scoped_ptr<DeviceAttachedIntentSource> device_attached_intent_source_; |
| 914 #endif |
912 | 915 |
913 scoped_ptr<FullscreenController> fullscreen_controller_; | 916 scoped_ptr<FullscreenController> fullscreen_controller_; |
914 | 917 |
915 scoped_ptr<extensions::WindowController> extension_window_controller_; | 918 scoped_ptr<extensions::WindowController> extension_window_controller_; |
916 | 919 |
917 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 920 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
918 | 921 |
919 // True if the browser window has been shown at least once. | 922 // True if the browser window has been shown at least once. |
920 bool window_has_shown_; | 923 bool window_has_shown_; |
921 | 924 |
922 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 925 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
923 // before DidEndColorChooser is called. | 926 // before DidEndColorChooser is called. |
924 scoped_ptr<content::ColorChooser> color_chooser_; | 927 scoped_ptr<content::ColorChooser> color_chooser_; |
925 | 928 |
926 DISALLOW_COPY_AND_ASSIGN(Browser); | 929 DISALLOW_COPY_AND_ASSIGN(Browser); |
927 }; | 930 }; |
928 | 931 |
929 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 932 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |