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

Unified Diff: chrome/browser/ui/views/color_chooser_aura.cc

Issue 148203008: Cleanup: do not reuse the ColorChooserAura instances. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
« no previous file with comments | « chrome/browser/ui/views/color_chooser_aura.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/color_chooser_aura.cc
diff --git a/chrome/browser/ui/views/color_chooser_aura.cc b/chrome/browser/ui/views/color_chooser_aura.cc
index d7bf7eb739a78d3b7ef40576f64c94ecefdd9341..ff8e02d795f4966ddbe941722d4905e3175c844b 100644
--- a/chrome/browser/ui/views/color_chooser_aura.cc
+++ b/chrome/browser/ui/views/color_chooser_aura.cc
@@ -12,8 +12,6 @@
#include "ui/views/color_chooser/color_chooser_view.h"
#include "ui/views/widget/widget.h"
-ColorChooserAura* ColorChooserAura::current_color_chooser_ = NULL;
-
ColorChooserAura::ColorChooserAura(content::WebContents* web_contents,
SkColor initial_color)
: web_contents_(web_contents) {
@@ -47,8 +45,6 @@ void ColorChooserAura::End() {
}
void ColorChooserAura::DidEndColorChooser() {
- DCHECK(current_color_chooser_ == this);
- current_color_chooser_ = NULL;
if (web_contents_)
web_contents_->DidEndColorChooser();
}
@@ -61,11 +57,7 @@ void ColorChooserAura::SetSelectedColor(SkColor color) {
// static
ColorChooserAura* ColorChooserAura::Open(
content::WebContents* web_contents, SkColor initial_color) {
- if (current_color_chooser_)
- current_color_chooser_->End();
- DCHECK(!current_color_chooser_);
- current_color_chooser_ = new ColorChooserAura(web_contents, initial_color);
- return current_color_chooser_;
+ return new ColorChooserAura(web_contents, initial_color);
}
#if !defined(OS_WIN)
« no previous file with comments | « chrome/browser/ui/views/color_chooser_aura.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698