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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
680 virtual void OnZoomIconChanged(TabContents* source, | 681 virtual void OnZoomIconChanged(TabContents* source, |
681 ZoomController::ZoomIconState state) OVERRIDE; | 682 ZoomController::ZoomIconState state) OVERRIDE; |
682 virtual void OnZoomChanged(TabContents* source, | 683 virtual void OnZoomChanged(TabContents* source, |
683 int zoom_percent, | 684 int zoom_percent, |
684 bool can_show_bubble) OVERRIDE; | 685 bool can_show_bubble) OVERRIDE; |
685 | 686 |
686 // Overridden from SelectFileDialog::Listener: | 687 // Overridden from SelectFileDialog::Listener: |
687 virtual void FileSelected(const FilePath& path, | 688 virtual void FileSelected(const FilePath& path, |
688 int index, | 689 int index, |
689 void* params) OVERRIDE; | 690 void* params) OVERRIDE; |
| 691 virtual void FileSelectedWithExtraInfo( |
| 692 const ui::SelectedFileInfo& file_info, |
| 693 int index, |
| 694 void* params) OVERRIDE; |
690 | 695 |
691 // Overridden from content::NotificationObserver: | 696 // Overridden from content::NotificationObserver: |
692 virtual void Observe(int type, | 697 virtual void Observe(int type, |
693 const content::NotificationSource& source, | 698 const content::NotificationSource& source, |
694 const content::NotificationDetails& details) OVERRIDE; | 699 const content::NotificationDetails& details) OVERRIDE; |
695 | 700 |
696 // Command and state updating /////////////////////////////////////////////// | 701 // Command and state updating /////////////////////////////////////////////// |
697 | 702 |
698 // Set the preference that indicates that the home page has been changed. | 703 // Set the preference that indicates that the home page has been changed. |
699 void MarkHomePageAsChanged(PrefService* pref_service); | 704 void MarkHomePageAsChanged(PrefService* pref_service); |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 bool window_has_shown_; | 930 bool window_has_shown_; |
926 | 931 |
927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 932 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
928 // before DidEndColorChooser is called. | 933 // before DidEndColorChooser is called. |
929 scoped_ptr<content::ColorChooser> color_chooser_; | 934 scoped_ptr<content::ColorChooser> color_chooser_; |
930 | 935 |
931 DISALLOW_COPY_AND_ASSIGN(Browser); | 936 DISALLOW_COPY_AND_ASSIGN(Browser); |
932 }; | 937 }; |
933 | 938 |
934 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 939 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |