Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5544)

Unified Diff: chrome/browser/ui/browser.h

Issue 9203001: Implement input type=color UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 060b720227f1923caa77eb3ddc19f204d30b0e62..c4155d57ea4b6f836135a55bb06d4a82498fb381 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;
Peter Kasting 2012/03/01 20:44:18 This declaration is bogus and should disappear.
keishi 2012/03/02 06:12:13 Done.
class Extension;
class FindBarController;
class FullscreenController;
@@ -1014,6 +1015,11 @@ class Browser : public TabHandlerDelegate,
virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE;
virtual content::JavaScriptDialogCreator*
GetJavaScriptDialogCreator() OVERRIDE;
+ virtual content::ColorChooser* OpenColorChooser(
+ content::WebContents* tab,
+ int color_chooser_id,
+ const SkColor& color) OVERRIDE;
+ virtual void DidEndColorChooser() OVERRIDE;
virtual void RunFileChooser(
content::WebContents* tab,
const content::FileChooserParams& params) OVERRIDE;
@@ -1460,6 +1466,10 @@ class Browser : public TabHandlerDelegate,
// True if the browser window has been shown at least once.
bool window_has_shown_;
+ // Currently open color chooser. Non-NULL after OpenColorChooser is called and
+ // before DidEndColorChooser is called.
+ scoped_ptr<content::ColorChooser> color_chooser_;
+
DISALLOW_COPY_AND_ASSIGN(Browser);
};

Powered by Google App Engine
This is Rietveld 408576698