diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 02:40:50 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 02:40:50 +0000 |
commit | b3a7033870585fff515df0c6e40ac2ac93b01db8 (patch) | |
tree | 5a36de90c758fc781f31d57e8e5f8d2197bf1337 /chrome/browser/app_modal_dialog_queue.h | |
parent | 1e187afa75fe66d8525651c1f395c40e8227844d (diff) | |
download | chromium_src-b3a7033870585fff515df0c6e40ac2ac93b01db8.zip chromium_src-b3a7033870585fff515df0c6e40ac2ac93b01db8.tar.gz chromium_src-b3a7033870585fff515df0c6e40ac2ac93b01db8.tar.bz2 |
ui test fail. revert.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_modal_dialog_queue.h')
-rw-r--r-- | chrome/browser/app_modal_dialog_queue.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/app_modal_dialog_queue.h b/chrome/browser/app_modal_dialog_queue.h index 9101c2e2..ff1b5f5 100644 --- a/chrome/browser/app_modal_dialog_queue.h +++ b/chrome/browser/app_modal_dialog_queue.h @@ -7,7 +7,7 @@ #include <queue> -#include "chrome/browser/app_modal_dialog_delegate.h" +#include "chrome/views/app_modal_dialog_delegate.h" // Keeps a queue of AppModalDialogDelegates, making sure only one app modal // dialog is shown at a time. @@ -23,7 +23,7 @@ class AppModalDialogQueue { // sloppy app modality. // Note: The AppModalDialogDelegate |dialog| must be window modal before it // can be added as app modal. - static void AddDialog(AppModalDialogDelegate* dialog); + static void AddDialog(views::AppModalDialogDelegate* dialog); // Removes the current dialog in the queue (the one that is being shown). // Shows the next dialog in the queue, if any is present. This does not @@ -45,20 +45,22 @@ class AppModalDialogQueue { } // Accessor for |active_dialog_|. - static AppModalDialogDelegate* active_dialog() { return active_dialog_; } + static views::AppModalDialogDelegate* active_dialog() { + return active_dialog_; + } private: // Shows |dialog| and notifies the BrowserList that a modal dialog is showing. - static void ShowModalDialog(AppModalDialogDelegate* dialog); + static void ShowModalDialog(views::AppModalDialogDelegate* dialog); // Contains all app modal dialogs which are waiting to be shown, with the // currently modal dialog at the front of the queue. - static std::queue<AppModalDialogDelegate*>* + static std::queue<views::AppModalDialogDelegate*>* app_modal_dialog_queue_; // The currently active app-modal dialog box's delegate. NULL if there is no // active app-modal dialog box. - static AppModalDialogDelegate* active_dialog_; + static views::AppModalDialogDelegate* active_dialog_; }; #endif // CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H__ |