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

Side by Side Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 209483003: Merge 256634 "Show dialog as separate post task." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/printing/print_view_manager_base.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h" 5 #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>( 855 PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
856 web_ui()->GetController()); 856 web_ui()->GetController());
857 print_preview_ui->OnHidePreviewDialog(); 857 print_preview_ui->OnHidePreviewDialog();
858 } 858 }
859 859
860 void PrintPreviewHandler::HandleCancelPendingPrintRequest( 860 void PrintPreviewHandler::HandleCancelPendingPrintRequest(
861 const base::ListValue* /*args*/) { 861 const base::ListValue* /*args*/) {
862 WebContents* initiator = GetInitiator(); 862 WebContents* initiator = GetInitiator();
863 if (initiator) 863 if (initiator)
864 ClearInitiatorDetails(); 864 ClearInitiatorDetails();
865 gfx::NativeWindow parent = initiator ? 865 chrome::ShowPrintErrorDialog();
866 initiator->GetView()->GetTopLevelNativeWindow() :
867 NULL;
868 chrome::ShowPrintErrorDialog(parent);
869 } 866 }
870 867
871 void PrintPreviewHandler::HandleSaveAppState(const base::ListValue* args) { 868 void PrintPreviewHandler::HandleSaveAppState(const base::ListValue* args) {
872 std::string data_to_save; 869 std::string data_to_save;
873 printing::StickySettings* sticky_settings = GetStickySettings(); 870 printing::StickySettings* sticky_settings = GetStickySettings();
874 if (args->GetString(0, &data_to_save) && !data_to_save.empty()) 871 if (args->GetString(0, &data_to_save) && !data_to_save.empty())
875 sticky_settings->StoreAppState(data_to_save); 872 sticky_settings->StoreAppState(data_to_save);
876 sticky_settings->SaveInPrefs(Profile::FromBrowserContext( 873 sticky_settings->SaveInPrefs(Profile::FromBrowserContext(
877 preview_web_contents()->GetBrowserContext())->GetPrefs()); 874 preview_web_contents()->GetBrowserContext())->GetPrefs());
878 } 875 }
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 printer_value->SetString("name", description.name); 1562 printer_value->SetString("name", description.name);
1566 printer_value->SetBoolean("hasLocalPrinting", has_local_printing); 1563 printer_value->SetBoolean("hasLocalPrinting", has_local_printing);
1567 printer_value->SetBoolean( 1564 printer_value->SetBoolean(
1568 "isUnregistered", 1565 "isUnregistered",
1569 description.id.empty() && 1566 description.id.empty() &&
1570 command_line->HasSwitch(switches::kEnablePrintPreviewRegisterPromos)); 1567 command_line->HasSwitch(switches::kEnablePrintPreviewRegisterPromos));
1571 printer_value->SetString("cloudID", description.id); 1568 printer_value->SetString("cloudID", description.id);
1572 } 1569 }
1573 1570
1574 #endif 1571 #endif
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_view_manager_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698