Commit 902482f9 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Small C++11 clean-up in web modal dialogs.

BUG=none
TBR=wittman@chromium.org

Change-Id: If60be20e1ef4e59838be04821eec0b30eba4d2be
Reviewed-on: https://chromium-review.googlesource.com/1252242Reviewed-by: default avatarLeonard Grey <lgrey@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595172}
parent d1596214
......@@ -61,11 +61,10 @@ content::WebContents* WebContentsModalDialogManager::GetWebContents() const {
}
void WebContentsModalDialogManager::WillClose(gfx::NativeWindow dialog) {
WebContentsModalDialogList::iterator dlg =
std::find_if(child_dialogs_.begin(), child_dialogs_.end(),
[dialog](const DialogState& child_dialog) {
return child_dialog.dialog == dialog;
});
auto dlg = std::find_if(child_dialogs_.begin(), child_dialogs_.end(),
[dialog](const DialogState& child_dialog) {
return child_dialog.dialog == dialog;
});
// The Views tab contents modal dialog calls WillClose twice. Ignore the
// second invocation.
......
......@@ -82,8 +82,6 @@ class WebContentsModalDialogManager
std::unique_ptr<SingleWebContentsDialogManager> manager;
};
using WebContentsModalDialogList = base::circular_deque<DialogState>;
// Blocks/unblocks interaction with renderer process.
void BlockWebContentsInteraction(bool blocked);
......@@ -101,7 +99,7 @@ class WebContentsModalDialogManager
WebContentsModalDialogManagerDelegate* delegate_;
// All active dialogs.
WebContentsModalDialogList child_dialogs_;
base::circular_deque<DialogState> child_dialogs_;
// Whether the WebContents' visibility is content::Visibility::HIDDEN.
bool web_contents_is_hidden_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment