Chromium Code Reviews| Index: chrome/browser/ui/browser.h |
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
| index 14a66bff1d5bc586fb46ee92d60e908f4f8ea358..911d016f6e91b347910f2d23af214d8520ff0231 100644 |
| --- a/chrome/browser/ui/browser.h |
| +++ b/chrome/browser/ui/browser.h |
| @@ -55,6 +55,7 @@ |
| class BrowserSyncedWindowDelegate; |
| class BrowserTabRestoreServiceDelegate; |
| class BrowserWindow; |
| +class ColorChooser; |
| class Extension; |
| class FindBarController; |
| class FullscreenController; |
| @@ -1001,6 +1002,14 @@ class Browser : public TabHandlerDelegate, |
| virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; |
| virtual content::JavaScriptDialogCreator* |
| GetJavaScriptDialogCreator() OVERRIDE; |
| + virtual void OpenColorChooser(content::WebContents* tab, |
| + int color_chooser_id, |
| + const SkColor& color) OVERRIDE; |
| + virtual void EndColorChooser(content::WebContents* tab, |
| + int color_chooser_id) OVERRIDE; |
| + virtual void SetSelectedColorInColorChooser(content::WebContents* tab, |
| + int color_chooser_id, |
| + const SkColor& color) OVERRIDE; |
| virtual void RunFileChooser( |
| content::WebContents* tab, |
| const content::FileChooserParams& params) OVERRIDE; |
| @@ -1451,6 +1460,8 @@ class Browser : public TabHandlerDelegate, |
| // True if the browser window has been shown at least once. |
| bool window_has_shown_; |
| + scoped_ptr<ColorChooser> color_chooser_; |
|
jam
2012/02/22 02:55:20
it doesn't look like this gets destroyed after it'
keishi
2012/02/24 14:38:54
I forgot to add color_chooser_.reset() to EndColor
|
| + |
| DISALLOW_COPY_AND_ASSIGN(Browser); |
| }; |