| 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 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 674 GetWebContentsModalDialogHost() OVERRIDE; | 674 GetWebContentsModalDialogHost() OVERRIDE; |
| 675 | 675 |
| 676 // Overridden from BookmarkTabHelperDelegate: | 676 // Overridden from BookmarkTabHelperDelegate: |
| 677 virtual void URLStarredChanged(content::WebContents* web_contents, | 677 virtual void URLStarredChanged(content::WebContents* web_contents, |
| 678 bool starred) OVERRIDE; | 678 bool starred) OVERRIDE; |
| 679 | 679 |
| 680 // Overridden from ZoomObserver: | 680 // Overridden from ZoomObserver: |
| 681 virtual void OnZoomChanged(content::WebContents* source, | 681 virtual void OnZoomChanged(content::WebContents* source, |
| 682 bool can_show_bubble) OVERRIDE; | 682 bool can_show_bubble) OVERRIDE; |
| 683 | 683 |
| 684 virtual void OnZoomChangeInitiated(content::WebContents* web_contents, |
| 685 double old_zoom_level, |
| 686 double new_zoom_level, |
| 687 ZoomMode zoom_mode) OVERRIDE; |
| 688 |
| 684 // Overridden from SelectFileDialog::Listener: | 689 // Overridden from SelectFileDialog::Listener: |
| 685 virtual void FileSelected(const base::FilePath& path, | 690 virtual void FileSelected(const base::FilePath& path, |
| 686 int index, | 691 int index, |
| 687 void* params) OVERRIDE; | 692 void* params) OVERRIDE; |
| 688 virtual void FileSelectedWithExtraInfo( | 693 virtual void FileSelectedWithExtraInfo( |
| 689 const ui::SelectedFileInfo& file_info, | 694 const ui::SelectedFileInfo& file_info, |
| 690 int index, | 695 int index, |
| 691 void* params) OVERRIDE; | 696 void* params) OVERRIDE; |
| 692 | 697 |
| 693 // Overridden from content::NotificationObserver: | 698 // Overridden from content::NotificationObserver: |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 base::WeakPtrFactory<Browser> weak_factory_; | 940 base::WeakPtrFactory<Browser> weak_factory_; |
| 936 | 941 |
| 937 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 942 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
| 938 | 943 |
| 939 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 944 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 940 | 945 |
| 941 DISALLOW_COPY_AND_ASSIGN(Browser); | 946 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 942 }; | 947 }; |
| 943 | 948 |
| 944 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 949 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |