| 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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 void* params) OVERRIDE; | 675 void* params) OVERRIDE; |
| 676 | 676 |
| 677 // Overridden from content::NotificationObserver: | 677 // Overridden from content::NotificationObserver: |
| 678 virtual void Observe(int type, | 678 virtual void Observe(int type, |
| 679 const content::NotificationSource& source, | 679 const content::NotificationSource& source, |
| 680 const content::NotificationDetails& details) OVERRIDE; | 680 const content::NotificationDetails& details) OVERRIDE; |
| 681 | 681 |
| 682 // Overridden from chrome::search::SearchModelObserver: | 682 // Overridden from chrome::search::SearchModelObserver: |
| 683 virtual void ModeChanged(const chrome::search::Mode& old_mode, | 683 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 684 const chrome::search::Mode& new_mode) OVERRIDE; | 684 const chrome::search::Mode& new_mode) OVERRIDE; |
| 685 virtual void TopBarsVisibilityChanged(const chrome::search::Mode& mode, |
| 686 bool visible) OVERRIDE; |
| 685 | 687 |
| 686 // Command and state updating /////////////////////////////////////////////// | 688 // Command and state updating /////////////////////////////////////////////// |
| 687 | 689 |
| 688 // Handle changes to kDevTools preference. | 690 // Handle changes to kDevTools preference. |
| 689 void OnDevToolsDisabledChanged(); | 691 void OnDevToolsDisabledChanged(); |
| 690 | 692 |
| 691 // Set the preference that indicates that the home page has been changed. | 693 // Set the preference that indicates that the home page has been changed. |
| 692 void MarkHomePageAsChanged(); | 694 void MarkHomePageAsChanged(); |
| 693 | 695 |
| 694 // UI update coalescing and handling //////////////////////////////////////// | 696 // UI update coalescing and handling //////////////////////////////////////// |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 925 bool window_has_shown_; | 927 bool window_has_shown_; |
| 926 | 928 |
| 927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 929 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 928 // before DidEndColorChooser is called. | 930 // before DidEndColorChooser is called. |
| 929 scoped_ptr<content::ColorChooser> color_chooser_; | 931 scoped_ptr<content::ColorChooser> color_chooser_; |
| 930 | 932 |
| 931 DISALLOW_COPY_AND_ASSIGN(Browser); | 933 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 932 }; | 934 }; |
| 933 | 935 |
| 934 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 936 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |