Index: chrome/browser/ui/browser.cc |
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
index 3a3e35fad37676e05457023a605953f298dd5f5a..68de20b2ad7e9a294efed6fab71d762cd7b29d54 100644 |
--- a/chrome/browser/ui/browser.cc |
+++ b/chrome/browser/ui/browser.cc |
@@ -150,6 +150,7 @@ |
#include "chrome/common/web_apps.h" |
#include "content/browser/browser_url_handler.h" |
#include "content/browser/renderer_host/render_view_host.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" |
@@ -4118,6 +4119,20 @@ content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() { |
return GetJavaScriptDialogCreatorInstance(); |
} |
+content::ColorChooser* Browser::OpenColorChooser(WebContents* tab, |
+ int color_chooser_id, |
+ const SkColor& color) { |
+ if (color_chooser_.get()) |
+ color_chooser_->End(); |
+ color_chooser_.reset(content::ColorChooser::Create(color_chooser_id, tab, |
+ color)); |
+ return color_chooser_.get(); |
+} |
+ |
+void Browser::DidEndColorChooser() { |
+ color_chooser_.reset(); |
+} |
+ |
void Browser::RunFileChooser(WebContents* tab, |
const content::FileChooserParams& params) { |
RunFileChooserHelper(tab, params); |