Make color chooser a modal dialog

Cong Liu · Cong Liu · commit 6b44f5cc3861 · 2015-08-06T17:06:58.000+08:00
diff --git a/src/browser/color_chooser_mac.mm b/src/browser/color_chooser_mac.mm
@@ -64,7 +64,7 @@ - (void)setColor:(NSColor*)color;
                                        SkColor initial_color) {
   if (current_color_chooser_)
     current_color_chooser_->End();
-  CHECK(!current_color_chooser_);
+  DCHECK(!current_color_chooser_);
   current_color_chooser_ =
       new ColorChooserMac(web_contents, initial_color);
   return current_color_chooser_;
@@ -80,7 +80,7 @@ - (void)setColor:(NSColor*)color;
 
 ColorChooserMac::~ColorChooserMac() {
   // Always call End() before destroying.
-  CHECK(!panel_);
+  DCHECK(!panel_);
 }
 
 void ColorChooserMac::DidChooseColorInColorPanel(SkColor color) {
@@ -94,7 +94,7 @@ - (void)setColor:(NSColor*)color;
 
 void ColorChooserMac::End() {
   panel_.reset();
-  CHECK(current_color_chooser_ == this);
+  DCHECK(current_color_chooser_ == this);
   current_color_chooser_ = NULL;
   if (web_contents_)
       web_contents_->DidEndColorChooser();
@@ -130,8 +130,8 @@ - (void)dealloc {
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
-  nonUserChange_ = NO;
   chooser_->DidCloseColorPabel();
+  nonUserChange_ = NO;
 }
 
 - (void)didChooseColor:(NSColorPanel*)panel {
@@ -156,6 +156,6 @@ - (void)setColor:(NSColor*)color {
   return ColorChooserMac::Open(web_contents, initial_color);
 }
 
-}  // namepace chrome
+}  // namepace nw
 
 @end
diff --git a/src/browser/color_chooser_win.cc b/src/browser/color_chooser_win.cc
@@ -4,7 +4,7 @@
 
 #include <windows.h>
 
-//#include "chrome/browser/platform_util.h"
+#include "chrome/browser/platform_util.h"
 #include "content/nw/src/browser/browser_dialogs.h"
 #include "content/nw/src/browser/color_chooser_dialog.h"
 #include "content/public/browser/color_chooser.h"
@@ -55,8 +55,8 @@ ColorChooserWin* ColorChooserWin::Open(content::WebContents* web_contents,
 ColorChooserWin::ColorChooserWin(content::WebContents* web_contents,
                                  SkColor initial_color)
     : web_contents_(web_contents) {
-  gfx::NativeWindow owning_window = (gfx::NativeWindow)::GetAncestor(
-      (HWND)web_contents->GetRenderViewHost()->GetView()->GetNativeView(), GA_ROOT);
+  gfx::NativeWindow owning_window = platform_util::GetTopLevel(
+      web_contents->GetRenderViewHost()->GetView()->GetNativeView());
   color_chooser_dialog_ = new ColorChooserDialog(this,
                                                  initial_color,
                                                  owning_window);
@@ -100,4 +100,4 @@ content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
   return ColorChooserWin::Open(web_contents, initial_color);
 }
 
-}  // namespace chrome
+}  // namespace nw
