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

Unified Diff: chrome/browser/devtools/devtools_window.cc

Issue 13150004: Support color chooser inside extesions, apps, chrome frame, dev tool (Closed) Base URL: http://git.chromium.org/chromium/src.git@ngcolor
Patch Set: Removed chrome/browser/ui/color_chooser.cc Created 7 years, 8 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/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index bc28c3e88e8e2e082353ea752c82e5fcac877854..f87d76e339a2c084532b63cf5de8a3218dca0a4b 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -40,6 +40,7 @@
#include "chrome/common/url_constants.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/child_process_security_policy.h"
+#include "content/public/browser/color_chooser.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_client_host.h"
#include "content/public/browser/devtools_manager.h"
@@ -1034,6 +1035,11 @@ content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
return content::WebContentsDelegate::GetJavaScriptDialogManager();
}
+content::ColorChooser* DevToolsWindow::OpenColorChooser(
+ WebContents* web_contents, SkColor initial_color) {
+ return content::ColorChooser::Open(web_contents, initial_color);
+}
+
void DevToolsWindow::RunFileChooser(WebContents* web_contents,
const FileChooserParams& params) {
FileSelectHelper::RunFileChooser(web_contents, params);

Powered by Google App Engine
This is Rietveld 408576698