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

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

Issue 9203001: Implement input type=color UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebased Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/color_chooser_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0e242151653b62d9395cf48689895cefe7af45dc..32c59d2482db1491aded6c8e0532211a01b9b729 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -151,6 +151,7 @@
#include "chrome/common/profiling.h"
#include "chrome/common/url_constants.h"
#include "chrome/common/web_apps.h"
+#include "content/public/browser/color_chooser.h"
#include "content/public/browser/devtools_manager.h"
#include "content/public/browser/download_item.h"
#include "content/public/browser/download_manager.h"
@@ -4155,6 +4156,28 @@ content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() {
return GetJavaScriptDialogCreatorInstance();
}
+content::ColorChooser* Browser::OpenColorChooser(WebContents* tab,
+ int color_chooser_id,
+ const SkColor& color) {
+#if defined(OS_WIN)
+ // On Windows, only create a color chooser if one doesn't exist, because we
+ // can't close the old color chooser dialog.
+ if (!color_chooser_.get())
+ color_chooser_.reset(content::ColorChooser::Create(color_chooser_id, tab,
+ color));
+#else
+ if (color_chooser_.get())
+ color_chooser_->End();
+ color_chooser_.reset(content::ColorChooser::Create(color_chooser_id, tab,
+ color));
+#endif
+ return color_chooser_.get();
+}
+
+void Browser::DidEndColorChooser() {
+ color_chooser_.reset();
+}
+
void Browser::RunFileChooser(WebContents* tab,
const content::FileChooserParams& params) {
RunFileChooserHelper(tab, params);
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/color_chooser_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698