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

Unified Diff: chrome/browser/ui/gtk/color_chooser_gtk.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: Created 7 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
Index: chrome/browser/ui/gtk/color_chooser_gtk.cc
diff --git a/chrome/browser/ui/gtk/color_chooser_gtk.cc b/chrome/browser/ui/gtk/color_chooser_gtk.cc
index 8b9384fec66bf755c767fe424fa16e9b9fb79f4c..e606fb8d3bc101eab79459f4f878c1bc07114e73 100644
--- a/chrome/browser/ui/gtk/color_chooser_gtk.cc
+++ b/chrome/browser/ui/gtk/color_chooser_gtk.cc
@@ -4,8 +4,9 @@
#include <gtk/gtk.h>
-#include "content/public/browser/color_chooser.h"
+#include "chrome/browser/ui/color_chooser_controller.h"
+#include "content/public/browser/color_chooser.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "grit/generated_resources.h"
@@ -91,6 +92,7 @@ void ColorChooserGtk::OnColorChooserDestroy(GtkWidget* widget) {
color_selection_dialog_ = NULL;
if (web_contents())
web_contents()->DidEndColorChooser(identifier());
+ ColorChooserController::GetInstance()->DidEndColorChooser();
}
void ColorChooserGtk::End() {

Powered by Google App Engine
This is Rietveld 408576698