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

Unified Diff: chrome/browser/ui/webui/print_preview_handler.cc

Issue 7550063: Print Preview: Handle a crashed initiator tab by showing a message in PP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments Created 9 years, 4 months 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/ui/webui/print_preview_handler.h ('k') | chrome/browser/ui/webui/print_preview_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc
index 77b694fcf338644d23e7cdb0bd94ec4e88ac11ff..4b8c617bd15f194ccc9ed914a02502abfd70c24a 100644
--- a/chrome/browser/ui/webui/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview_handler.cc
@@ -73,6 +73,7 @@ enum UserActionBuckets {
CANCEL,
FALLBACK_TO_ADVANCED_SETTINGS_DIALOG,
PREVIEW_FAILED,
+ INITIATOR_TAB_CRASHED,
Lei Zhang 2011/08/16 03:30:41 do we need a corresponding change in some UMA .xml
kmadhusu 2011/08/16 16:46:47 Yeah. That will be a seperate CL.
PREVIEW_STARTED,
USERACTION_BUCKET_BOUNDARY
};
@@ -432,6 +433,8 @@ void PrintPreviewHandler::RegisterMessages() {
NewCallback(this, &PrintPreviewHandler::HandleManageCloudPrint));
web_ui_->RegisterMessageCallback("manageLocalPrinters",
NewCallback(this, &PrintPreviewHandler::HandleManagePrinters));
+ web_ui_->RegisterMessageCallback("reloadCrashedInitiatorTab",
+ NewCallback(this, &PrintPreviewHandler::HandleReloadCrashedInitiatorTab));
web_ui_->RegisterMessageCallback("closePrintPreviewTab",
NewCallback(this, &PrintPreviewHandler::HandleClosePreviewTab));
web_ui_->RegisterMessageCallback("hidePreview",
@@ -651,6 +654,19 @@ void PrintPreviewHandler::HandleManagePrinters(const ListValue* args) {
printing::PrinterManagerDialog::ShowPrinterManagerDialog();
}
+void PrintPreviewHandler::HandleReloadCrashedInitiatorTab(const ListValue*) {
+ ReportStats();
+ ReportUserActionHistogram(INITIATOR_TAB_CRASHED);
+
+ TabContents* initiator_tab = GetInitiatorTab();
+ if (!initiator_tab)
+ return;
+
+ initiator_tab->OpenURL(
+ initiator_tab->GetURL(), GURL(), CURRENT_TAB, PageTransition::RELOAD);
+ ActivateInitiatorTabAndClosePreviewTab();
+}
+
void PrintPreviewHandler::HandleClosePreviewTab(const ListValue* args) {
ReportStats();
ReportUserActionHistogram(CANCEL);
@@ -830,7 +846,7 @@ void PrintPreviewHandler::SelectFile(const FilePath& default_filename) {
NULL);
}
-void PrintPreviewHandler::OnNavigation() {
+void PrintPreviewHandler::OnTabDestroyed() {
TabContents* initiator_tab = GetInitiatorTab();
if (!initiator_tab)
return;
« no previous file with comments | « chrome/browser/ui/webui/print_preview_handler.h ('k') | chrome/browser/ui/webui/print_preview_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698