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

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: 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.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3a3e35fad37676e05457023a605953f298dd5f5a..8e1c3d4bcf960cbd43b1b6175c9c91b93dc182e0 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -108,6 +108,7 @@
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/color_chooser.h"
#include "chrome/browser/ui/constrained_window_tab_helper.h"
#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/browser/ui/find_bar/find_bar.h"
@@ -150,6 +151,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 +4120,21 @@ 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(ColorChooser::Create(color_chooser_id,
+ tab,
Peter Kasting 2012/02/29 01:40:07 Nit: Go ahead and put this arg on the previous lin
keishi 2012/02/29 13:05:22 Done.
+ color));
+ return static_cast<content::ColorChooser*>(color_chooser_.get());
Peter Kasting 2012/02/29 01:40:07 Nit: Make |color_chooser_| be of this type so you
keishi 2012/02/29 13:05:22 Done.
+}
+
+void Browser::DidEndColorChooser() {
+ color_chooser_.reset();
+}
+
void Browser::RunFileChooser(WebContents* tab,
const content::FileChooserParams& params) {
RunFileChooserHelper(tab, params);

Powered by Google App Engine
This is Rietveld 408576698