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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 namespace extensions { | 78 namespace extensions { |
79 class Extension; | 79 class Extension; |
80 class WindowController; | 80 class WindowController; |
81 } | 81 } |
82 | 82 |
83 namespace gfx { | 83 namespace gfx { |
84 class Point; | 84 class Point; |
85 } | 85 } |
86 | 86 |
87 namespace ui { | 87 namespace ui { |
| 88 struct SelectedFileInfo; |
88 class WebDialogDelegate; | 89 class WebDialogDelegate; |
89 } | 90 } |
90 | 91 |
91 namespace webkit_glue { | 92 namespace webkit_glue { |
92 struct WebIntentServiceData; | 93 struct WebIntentServiceData; |
93 } | 94 } |
94 | 95 |
95 class Browser : public TabStripModelObserver, | 96 class Browser : public TabStripModelObserver, |
96 public content::WebContentsDelegate, | 97 public content::WebContentsDelegate, |
97 public CoreTabHelperDelegate, | 98 public CoreTabHelperDelegate, |
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 virtual void OnZoomIconChanged(TabContents* source, | 659 virtual void OnZoomIconChanged(TabContents* source, |
659 ZoomController::ZoomIconState state) OVERRIDE; | 660 ZoomController::ZoomIconState state) OVERRIDE; |
660 virtual void OnZoomChanged(TabContents* source, | 661 virtual void OnZoomChanged(TabContents* source, |
661 int zoom_percent, | 662 int zoom_percent, |
662 bool can_show_bubble) OVERRIDE; | 663 bool can_show_bubble) OVERRIDE; |
663 | 664 |
664 // Overridden from SelectFileDialog::Listener: | 665 // Overridden from SelectFileDialog::Listener: |
665 virtual void FileSelected(const FilePath& path, | 666 virtual void FileSelected(const FilePath& path, |
666 int index, | 667 int index, |
667 void* params) OVERRIDE; | 668 void* params) OVERRIDE; |
| 669 virtual void FileSelectedWithExtraInfo( |
| 670 const ui::SelectedFileInfo& file_info, |
| 671 int index, |
| 672 void* params) OVERRIDE; |
668 | 673 |
669 // Overridden from content::NotificationObserver: | 674 // Overridden from content::NotificationObserver: |
670 virtual void Observe(int type, | 675 virtual void Observe(int type, |
671 const content::NotificationSource& source, | 676 const content::NotificationSource& source, |
672 const content::NotificationDetails& details) OVERRIDE; | 677 const content::NotificationDetails& details) OVERRIDE; |
673 | 678 |
674 // Command and state updating /////////////////////////////////////////////// | 679 // Command and state updating /////////////////////////////////////////////// |
675 | 680 |
676 // Set the preference that indicates that the home page has been changed. | 681 // Set the preference that indicates that the home page has been changed. |
677 void MarkHomePageAsChanged(PrefService* pref_service); | 682 void MarkHomePageAsChanged(PrefService* pref_service); |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
903 bool window_has_shown_; | 908 bool window_has_shown_; |
904 | 909 |
905 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 910 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
906 // before DidEndColorChooser is called. | 911 // before DidEndColorChooser is called. |
907 scoped_ptr<content::ColorChooser> color_chooser_; | 912 scoped_ptr<content::ColorChooser> color_chooser_; |
908 | 913 |
909 DISALLOW_COPY_AND_ASSIGN(Browser); | 914 DISALLOW_COPY_AND_ASSIGN(Browser); |
910 }; | 915 }; |
911 | 916 |
912 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 917 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |