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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1025 virtual void ContentRestrictionsChanged( | 1025 virtual void ContentRestrictionsChanged( |
1026 content::WebContents* source) OVERRIDE; | 1026 content::WebContents* source) OVERRIDE; |
1027 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 1027 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
1028 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 1028 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
1029 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 1029 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
1030 virtual void DidNavigateMainFramePostCommit( | 1030 virtual void DidNavigateMainFramePostCommit( |
1031 content::WebContents* tab) OVERRIDE; | 1031 content::WebContents* tab) OVERRIDE; |
1032 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; | 1032 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; |
1033 virtual content::JavaScriptDialogCreator* | 1033 virtual content::JavaScriptDialogCreator* |
1034 GetJavaScriptDialogCreator() OVERRIDE; | 1034 GetJavaScriptDialogCreator() OVERRIDE; |
| 1035 virtual content::ColorChooser* OpenColorChooser( |
| 1036 content::WebContents* tab, |
| 1037 int color_chooser_id, |
| 1038 const SkColor& color) OVERRIDE; |
| 1039 virtual void DidEndColorChooser() OVERRIDE; |
1035 virtual void RunFileChooser( | 1040 virtual void RunFileChooser( |
1036 content::WebContents* tab, | 1041 content::WebContents* tab, |
1037 const content::FileChooserParams& params) OVERRIDE; | 1042 const content::FileChooserParams& params) OVERRIDE; |
1038 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, | 1043 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, |
1039 const FilePath& path) OVERRIDE; | 1044 const FilePath& path) OVERRIDE; |
1040 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, | 1045 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, |
1041 bool enter_fullscreen) OVERRIDE; | 1046 bool enter_fullscreen) OVERRIDE; |
1042 virtual bool IsFullscreenForTab( | 1047 virtual bool IsFullscreenForTab( |
1043 const content::WebContents* tab) const OVERRIDE; | 1048 const content::WebContents* tab) const OVERRIDE; |
1044 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; | 1049 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1483 | 1488 |
1484 BookmarkBar::State bookmark_bar_state_; | 1489 BookmarkBar::State bookmark_bar_state_; |
1485 | 1490 |
1486 scoped_refptr<FullscreenController> fullscreen_controller_; | 1491 scoped_refptr<FullscreenController> fullscreen_controller_; |
1487 | 1492 |
1488 scoped_ptr<ExtensionWindowController> extension_window_controller_; | 1493 scoped_ptr<ExtensionWindowController> extension_window_controller_; |
1489 | 1494 |
1490 // True if the browser window has been shown at least once. | 1495 // True if the browser window has been shown at least once. |
1491 bool window_has_shown_; | 1496 bool window_has_shown_; |
1492 | 1497 |
| 1498 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1499 // before DidEndColorChooser is called. |
| 1500 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1501 |
1493 DISALLOW_COPY_AND_ASSIGN(Browser); | 1502 DISALLOW_COPY_AND_ASSIGN(Browser); |
1494 }; | 1503 }; |
1495 | 1504 |
1496 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1505 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |