| 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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 | 665 |
| 666 // Overridden from BlockedContentTabHelperDelegate: | 666 // Overridden from BlockedContentTabHelperDelegate: |
| 667 virtual content::WebContents* GetConstrainingWebContents( | 667 virtual content::WebContents* GetConstrainingWebContents( |
| 668 content::WebContents* source) OVERRIDE; | 668 content::WebContents* source) OVERRIDE; |
| 669 | 669 |
| 670 // Overridden from BookmarkTabHelperDelegate: | 670 // Overridden from BookmarkTabHelperDelegate: |
| 671 virtual void URLStarredChanged(content::WebContents* web_contents, | 671 virtual void URLStarredChanged(content::WebContents* web_contents, |
| 672 bool starred) OVERRIDE; | 672 bool starred) OVERRIDE; |
| 673 | 673 |
| 674 // Overridden from ZoomObserver: | 674 // Overridden from ZoomObserver: |
| 675 virtual void OnZoomChanged(TabContents* source, | 675 virtual void OnZoomChanged(content::WebContents* source, |
| 676 bool can_show_bubble) OVERRIDE; | 676 bool can_show_bubble) OVERRIDE; |
| 677 | 677 |
| 678 // Overridden from SelectFileDialog::Listener: | 678 // Overridden from SelectFileDialog::Listener: |
| 679 virtual void FileSelected(const FilePath& path, | 679 virtual void FileSelected(const FilePath& path, |
| 680 int index, | 680 int index, |
| 681 void* params) OVERRIDE; | 681 void* params) OVERRIDE; |
| 682 virtual void FileSelectedWithExtraInfo( | 682 virtual void FileSelectedWithExtraInfo( |
| 683 const ui::SelectedFileInfo& file_info, | 683 const ui::SelectedFileInfo& file_info, |
| 684 int index, | 684 int index, |
| 685 void* params) OVERRIDE; | 685 void* params) OVERRIDE; |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 bool window_has_shown_; | 935 bool window_has_shown_; |
| 936 | 936 |
| 937 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 937 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 938 // before DidEndColorChooser is called. | 938 // before DidEndColorChooser is called. |
| 939 scoped_ptr<content::ColorChooser> color_chooser_; | 939 scoped_ptr<content::ColorChooser> color_chooser_; |
| 940 | 940 |
| 941 DISALLOW_COPY_AND_ASSIGN(Browser); | 941 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 942 }; | 942 }; |
| 943 | 943 |
| 944 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 944 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |