OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
828 virtual void Observe(NotificationType type, | 828 virtual void Observe(NotificationType type, |
829 const NotificationSource& source, | 829 const NotificationSource& source, |
830 const NotificationDetails& details); | 830 const NotificationDetails& details); |
831 | 831 |
832 void RemoveCrashedExtensionInfoBar(const std::string& id); | 832 void RemoveCrashedExtensionInfoBar(const std::string& id); |
833 | 833 |
834 // Overridden from ProfileSyncServiceObserver: | 834 // Overridden from ProfileSyncServiceObserver: |
835 virtual void OnStateChanged(); | 835 virtual void OnStateChanged(); |
836 | 836 |
837 // Overriden from InstantDelegate: | 837 // Overriden from InstantDelegate: |
838 virtual void PrepareForInstant(); | 838 virtual void PrepareForInstant() OVERRIDE; |
839 virtual void ShowInstant(TabContentsWrapper* preview_contents); | 839 virtual void ShowInstant(TabContentsWrapper* preview_contents) OVERRIDE; |
840 virtual void HideInstant(); | 840 virtual void HideInstant() OVERRIDE; |
841 virtual void CommitInstant(TabContentsWrapper* preview_contents); | 841 virtual void CommitInstant(TabContentsWrapper* preview_contents) OVERRIDE; |
842 virtual void SetSuggestedText(const string16& text); | 842 virtual void SetSuggestedText(const string16& text, |
843 virtual gfx::Rect GetInstantBounds(); | 843 InstantCompleteBehavior behavior) OVERRIDE; |
| 844 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
844 | 845 |
845 // Command and state updating /////////////////////////////////////////////// | 846 // Command and state updating /////////////////////////////////////////////// |
846 | 847 |
847 // Initialize state for all browser commands. | 848 // Initialize state for all browser commands. |
848 void InitCommandState(); | 849 void InitCommandState(); |
849 | 850 |
850 // Update commands whose state depends on the tab's state. | 851 // Update commands whose state depends on the tab's state. |
851 void UpdateCommandsForTabState(); | 852 void UpdateCommandsForTabState(); |
852 | 853 |
853 // Updates commands when the content's restrictions change. | 854 // Updates commands when the content's restrictions change. |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1153 // and we install ourselves as an observer. | 1154 // and we install ourselves as an observer. |
1154 TabRestoreService* tab_restore_service_; | 1155 TabRestoreService* tab_restore_service_; |
1155 | 1156 |
1156 scoped_ptr<InstantController> instant_; | 1157 scoped_ptr<InstantController> instant_; |
1157 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1158 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1158 | 1159 |
1159 DISALLOW_COPY_AND_ASSIGN(Browser); | 1160 DISALLOW_COPY_AND_ASSIGN(Browser); |
1160 }; | 1161 }; |
1161 | 1162 |
1162 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1163 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |