| 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 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 Profile* profile) OVERRIDE; | 658 Profile* profile) OVERRIDE; |
| 659 | 659 |
| 660 // Overridden from ConstrainedWindowTabHelperDelegate: | 660 // Overridden from ConstrainedWindowTabHelperDelegate: |
| 661 virtual void SetTabContentBlocked(TabContents* contents, | 661 virtual void SetTabContentBlocked(TabContents* contents, |
| 662 bool blocked) OVERRIDE; | 662 bool blocked) OVERRIDE; |
| 663 | 663 |
| 664 // Overridden from BlockedContentTabHelperDelegate: | 664 // Overridden from BlockedContentTabHelperDelegate: |
| 665 virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE; | 665 virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE; |
| 666 | 666 |
| 667 // Overridden from BookmarkTabHelperDelegate: | 667 // Overridden from BookmarkTabHelperDelegate: |
| 668 virtual void URLStarredChanged(TabContents* source, | 668 virtual void URLStarredChanged(content::WebContents* web_contents, |
| 669 bool starred) OVERRIDE; | 669 bool starred) OVERRIDE; |
| 670 | 670 |
| 671 // Overridden from ZoomObserver: | 671 // Overridden from ZoomObserver: |
| 672 virtual void OnZoomChanged(TabContents* source, | 672 virtual void OnZoomChanged(TabContents* source, |
| 673 bool can_show_bubble) OVERRIDE; | 673 bool can_show_bubble) OVERRIDE; |
| 674 | 674 |
| 675 // Overridden from SelectFileDialog::Listener: | 675 // Overridden from SelectFileDialog::Listener: |
| 676 virtual void FileSelected(const FilePath& path, | 676 virtual void FileSelected(const FilePath& path, |
| 677 int index, | 677 int index, |
| 678 void* params) OVERRIDE; | 678 void* params) OVERRIDE; |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 bool window_has_shown_; | 932 bool window_has_shown_; |
| 933 | 933 |
| 934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 935 // before DidEndColorChooser is called. | 935 // before DidEndColorChooser is called. |
| 936 scoped_ptr<content::ColorChooser> color_chooser_; | 936 scoped_ptr<content::ColorChooser> color_chooser_; |
| 937 | 937 |
| 938 DISALLOW_COPY_AND_ASSIGN(Browser); | 938 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 939 }; | 939 }; |
| 940 | 940 |
| 941 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 941 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |