Firefox overlay is seen opened even if Import Overlay is Cancelled.

chrome/browser/ui/views/importer/import_lock_dialog_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/importer/import_lock_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/metrics/user_metrics.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using base::UserMetricsAction;
 
+namespace {

[Ilya Sherman, 2017/04/05 06:15:29]

nit: Please leave a blank line after this one.

[nikhil.sahni, 2017/04/05 07:35:49]

Done.

+// For storing widget ptr on creation of dialog widget
+// using method CreateDialogWidget.

[Ilya Sherman, 2017/04/05 06:15:29]

nit: Please re-wrap this comment to 80-col.

[Ilya Sherman, 2017/04/05 06:15:29]

Please simplify this comment a bit to something like

// A reference to the currently active widget backing the import lock dialog, or
// null if the dialog is not open.

[nikhil.sahni, 2017/04/05 07:35:49]

Done.

+static views::Widget* g_widget = nullptr;

[Ilya Sherman, 2017/04/05 06:15:29]

nit: Please leave a blank line after this one.

[nikhil.sahni, 2017/04/05 07:35:49]

Done.

+}
+
 namespace importer {
 
 void ShowImportLockDialog(gfx::NativeWindow parent,
                           const base::Callback<void(bool)>& callback) {
   ImportLockDialogView::Show(parent, callback);
   base::RecordAction(UserMetricsAction("ImportLockDialogView_Shown"));
 }
 
+void HideImportLockDialog() {
+  ImportLockDialogView::Hide();
+}
+
 }  // namespace importer
 
 // static
 void ImportLockDialogView::Show(gfx::NativeWindow parent,
                                 const base::Callback<void(bool)>& callback) {
-  views::DialogDelegate::CreateDialogWidget(
-      new ImportLockDialogView(callback), NULL, NULL)->Show();
+  ImportLockDialogView* dialog_view = new ImportLockDialogView(callback);
+  g_widget = views::DialogDelegate::CreateDialogWidget(import_lock_dialog_view,

[Ilya Sherman, 2017/04/05 06:15:29]

Please update the variable name import_lock_dialog_view used here to
dialog_view.

[nikhil.sahni, 2017/04/05 07:35:49]

Done.

+                                                       NULL, NULL);
+  g_widget->AddObserver(dialog_view);
+  g_widget->Show();
+}
+
+// static
+void ImportLockDialogView::Hide() {
+  if (g_widget)
+    g_widget->Close();
 }
 
 ImportLockDialogView::ImportLockDialogView(
     const base::Callback<void(bool)>& callback)
     : description_label_(NULL),
       callback_(callback) {
   description_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_TEXT));
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(description_label_);
 }
 
 ImportLockDialogView::~ImportLockDialogView() {
 }
 
+void ImportLockDialogView::OnWidgetDestroying(views::Widget* widget) {
+  DCHECK_EQ(widget, g_widget);
+  g_widget = nullptr;
+  widget->RemoveObserver(this);
+}
+
 gfx::Size ImportLockDialogView::GetPreferredSize() const {
   return gfx::Size(views::Widget::GetLocalizedContentsSize(
       IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS,
       IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES));
 }
 
 void ImportLockDialogView::Layout() {
   gfx::Rect bounds(GetLocalBounds());
   bounds.Inset(views::kButtonHEdgeMarginNew,
                LayoutDelegate::Get()->GetMetric(
@@ skipping 15 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback_, true));
   return true;
 }
 
 bool ImportLockDialogView::Cancel() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback_, false));
   return true;
 }