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

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: Rebased Created 7 years, 7 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 ee2faa4301f52e41f8843ab2bd155cae812466ab..e3d051bafeba5020ccbe8b29915a7b540dff960a 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -30,6 +30,7 @@
#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/color_chooser_util.h"
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -1100,6 +1101,11 @@ content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
return content::WebContentsDelegate::GetJavaScriptDialogManager();
}
+content::ColorChooser* DevToolsWindow::OpenColorChooser(
+ WebContents* web_contents, SkColor initial_color) {
+ return ::OpenColorChooser(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