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

Unified Diff: chrome/browser/app_modal_dialog_queue.cc

Issue 5471002: Move app_modal_dialog stuff to ui/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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/app_modal_dialog_queue.h ('k') | chrome/browser/automation/automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_modal_dialog_queue.cc
===================================================================
--- chrome/browser/app_modal_dialog_queue.cc (revision 67887)
+++ chrome/browser/app_modal_dialog_queue.cc (working copy)
@@ -1,64 +0,0 @@
-// Copyright (c) 2010 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/app_modal_dialog_queue.h"
-
-#include "chrome/browser/browser_list.h"
-
-void AppModalDialogQueue::AddDialog(AppModalDialog* dialog) {
- if (!active_dialog_) {
- ShowModalDialog(dialog);
- return;
- }
- app_modal_dialog_queue_.push(dialog);
-}
-
-void AppModalDialogQueue::ShowNextDialog() {
- AppModalDialog* dialog = GetNextDialog();
- if (dialog)
- ShowModalDialog(dialog);
- else
- active_dialog_ = NULL;
-}
-
-void AppModalDialogQueue::ActivateModalDialog() {
- if (showing_modal_dialog_) {
- // As part of showing a modal dialog we may end up back in this method
- // (showing a dialog activates the TabContents, which can trigger a call
- // to ActivateModalDialog). We ignore such a request as after the call to
- // activate the tab contents the dialog is shown.
- return;
- }
- if (active_dialog_)
- active_dialog_->ActivateModalDialog();
-}
-
-AppModalDialogQueue::AppModalDialogQueue()
- : active_dialog_(NULL), showing_modal_dialog_(false) {
-}
-
-AppModalDialogQueue::~AppModalDialogQueue() {}
-
-void AppModalDialogQueue::ShowModalDialog(AppModalDialog* dialog) {
- // Be sure and set the active_dialog_ field first, otherwise if
- // ShowModalDialog triggers a call back to the queue they'll get the old
- // dialog. Also, if the dialog calls |ShowNextDialog()| before returning, that
- // would write NULL into |active_dialog_| and this function would then undo
- // that.
- active_dialog_ = dialog;
- showing_modal_dialog_ = true;
- dialog->ShowModalDialog();
- showing_modal_dialog_ = false;
-}
-
-AppModalDialog* AppModalDialogQueue::GetNextDialog() {
- while (!app_modal_dialog_queue_.empty()) {
- AppModalDialog* dialog = app_modal_dialog_queue_.front();
- app_modal_dialog_queue_.pop();
- if (dialog->IsValid())
- return dialog;
- delete dialog;
- }
- return NULL;
-}
« no previous file with comments | « chrome/browser/app_modal_dialog_queue.h ('k') | chrome/browser/automation/automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698