| Index: chrome/browser/ui/browser_commands.cc
|
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
|
| index b2660777297636fe258033a1734041709a206a1e..038a36f0b647206ceb9a3cca416128264bd4acb9 100644
|
| --- a/chrome/browser/ui/browser_commands.cc
|
| +++ b/chrome/browser/ui/browser_commands.cc
|
| @@ -244,6 +244,11 @@ bool IsShowingWebContentsModalDialog(const Browser* browser) {
|
| if (!web_contents)
|
| return false;
|
|
|
| + // TODO(gbillock): This caller needs update to the PopupManager. It gets
|
| + // called by the CanPrint method, which may be too restrictive if we allow
|
| + // print preview to overlap -- we should just queue print requests or attach
|
| + // a user gesture or whatever we know.
|
| +
|
| WebContentsModalDialogManager* web_contents_modal_dialog_manager =
|
| WebContentsModalDialogManager::FromWebContents(web_contents);
|
| return web_contents_modal_dialog_manager->IsDialogActive();
|
| @@ -735,7 +740,7 @@ void BookmarkCurrentPage(Browser* browser) {
|
| case extensions::CommandService::PAGE_ACTION:
|
| browser->window()->ShowPageActionPopup(extension);
|
| return;
|
| - };
|
| + }
|
| }
|
|
|
| BookmarkCurrentPageInternal(browser);
|
|
|