| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/blocked_content/app_modal_dialog_helper.h" | 5 #include "chrome/browser/ui/blocked_content/app_modal_dialog_helper.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/browser_finder.h" | 8 #include "chrome/browser/ui/browser_finder.h" |
| 9 #include "chrome/browser/ui/browser_list.h" | 9 #include "chrome/browser/ui/browser_list.h" |
| 10 #include "chrome/browser/ui/host_desktop.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 12 #include "content/public/browser/web_contents_delegate.h" | 13 #include "content/public/browser/web_contents_delegate.h" |
| 13 | 14 |
| 14 AppModalDialogHelper::AppModalDialogHelper(content::WebContents* dialog_host) | 15 AppModalDialogHelper::AppModalDialogHelper(content::WebContents* dialog_host) |
| 15 : popup_(nullptr) { | 16 : popup_(nullptr) { |
| 16 // If the WebContents that triggered this dialog is not currently focused, we | 17 // If the WebContents that triggered this dialog is not currently focused, we |
| 17 // want to store a potential popup here to restore it after the dialog was | 18 // want to store a potential popup here to restore it after the dialog was |
| 18 // closed. | 19 // closed. |
| 19 ui::HostDesktopType desktop_type = | 20 ui::HostDesktopType desktop_type = |
| (...skipping 14 matching lines...) Expand all Loading... |
| 34 } | 35 } |
| 35 | 36 |
| 36 AppModalDialogHelper::~AppModalDialogHelper() { | 37 AppModalDialogHelper::~AppModalDialogHelper() { |
| 37 if (popup_) | 38 if (popup_) |
| 38 popup_->GetDelegate()->ActivateContents(popup_); | 39 popup_->GetDelegate()->ActivateContents(popup_); |
| 39 } | 40 } |
| 40 | 41 |
| 41 void AppModalDialogHelper::WebContentsDestroyed() { | 42 void AppModalDialogHelper::WebContentsDestroyed() { |
| 42 popup_ = nullptr; | 43 popup_ = nullptr; |
| 43 } | 44 } |
| OLD | NEW |