OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 755 matching lines...) Loading... |
766 | 766 |
767 // Overridden from NotificationObserver: | 767 // Overridden from NotificationObserver: |
768 virtual void Observe(NotificationType type, | 768 virtual void Observe(NotificationType type, |
769 const NotificationSource& source, | 769 const NotificationSource& source, |
770 const NotificationDetails& details); | 770 const NotificationDetails& details); |
771 | 771 |
772 // Overridden from ProfileSyncServiceObserver: | 772 // Overridden from ProfileSyncServiceObserver: |
773 virtual void OnStateChanged(); | 773 virtual void OnStateChanged(); |
774 | 774 |
775 // Overriden from InstantDelegate: | 775 // Overriden from InstantDelegate: |
| 776 virtual void PrepareForInstant(); |
776 virtual void ShowInstant(TabContents* preview_contents); | 777 virtual void ShowInstant(TabContents* preview_contents); |
777 virtual void HideInstant(); | 778 virtual void HideInstant(); |
778 virtual void CommitInstant(TabContents* preview_contents); | 779 virtual void CommitInstant(TabContents* preview_contents); |
779 virtual void SetSuggestedText(const string16& text); | 780 virtual void SetSuggestedText(const string16& text); |
780 virtual gfx::Rect GetInstantBounds(); | 781 virtual gfx::Rect GetInstantBounds(); |
781 | 782 |
782 // Command and state updating /////////////////////////////////////////////// | 783 // Command and state updating /////////////////////////////////////////////// |
783 | 784 |
784 // Initialize state for all browser commands. | 785 // Initialize state for all browser commands. |
785 void InitCommandState(); | 786 void InitCommandState(); |
(...skipping 299 matching lines...) Loading... |
1085 // The profile's tab restore service. The service is owned by the profile, | 1086 // The profile's tab restore service. The service is owned by the profile, |
1086 // and we install ourselves as an observer. | 1087 // and we install ourselves as an observer. |
1087 TabRestoreService* tab_restore_service_; | 1088 TabRestoreService* tab_restore_service_; |
1088 | 1089 |
1089 scoped_ptr<InstantController> instant_; | 1090 scoped_ptr<InstantController> instant_; |
1090 | 1091 |
1091 DISALLOW_COPY_AND_ASSIGN(Browser); | 1092 DISALLOW_COPY_AND_ASSIGN(Browser); |
1092 }; | 1093 }; |
1093 | 1094 |
1094 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1095 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |