| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1014 | 1014 |
| 1015 // Overridden from SearchEngineTabHelperDelegate: | 1015 // Overridden from SearchEngineTabHelperDelegate: |
| 1016 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 1016 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| 1017 Profile* profile) OVERRIDE; | 1017 Profile* profile) OVERRIDE; |
| 1018 | 1018 |
| 1019 // Overridden from ConstrainedWindowTabHelperDelegate: | 1019 // Overridden from ConstrainedWindowTabHelperDelegate: |
| 1020 virtual void SetTabContentBlocked(TabContents* contents, | 1020 virtual void SetTabContentBlocked(TabContents* contents, |
| 1021 bool blocked) OVERRIDE; | 1021 bool blocked) OVERRIDE; |
| 1022 | 1022 |
| 1023 // Overridden from BlockedContentTabHelperDelegate: | 1023 // Overridden from BlockedContentTabHelperDelegate: |
| 1024 virtual TabContents* GetConstrainingContentsWrapper( | 1024 virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE; |
| 1025 TabContents* source) OVERRIDE; | |
| 1026 | 1025 |
| 1027 // Overridden from BookmarkTabHelperDelegate: | 1026 // Overridden from BookmarkTabHelperDelegate: |
| 1028 virtual void URLStarredChanged(TabContents* source, | 1027 virtual void URLStarredChanged(TabContents* source, |
| 1029 bool starred) OVERRIDE; | 1028 bool starred) OVERRIDE; |
| 1030 | 1029 |
| 1031 // Overridden from ZoomObserver: | 1030 // Overridden from ZoomObserver: |
| 1032 virtual void OnZoomIconChanged(TabContents* source, | 1031 virtual void OnZoomIconChanged(TabContents* source, |
| 1033 ZoomController::ZoomIconState state) OVERRIDE; | 1032 ZoomController::ZoomIconState state) OVERRIDE; |
| 1034 virtual void OnZoomChanged(TabContents* source, | 1033 virtual void OnZoomChanged(TabContents* source, |
| 1035 int zoom_percent, | 1034 int zoom_percent, |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1430 bool window_has_shown_; | 1429 bool window_has_shown_; |
| 1431 | 1430 |
| 1432 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1431 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1433 // before DidEndColorChooser is called. | 1432 // before DidEndColorChooser is called. |
| 1434 scoped_ptr<content::ColorChooser> color_chooser_; | 1433 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1435 | 1434 |
| 1436 DISALLOW_COPY_AND_ASSIGN(Browser); | 1435 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1437 }; | 1436 }; |
| 1438 | 1437 |
| 1439 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1438 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |