OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_handler.h" | 5 #include "chrome/browser/ui/webui/print_preview_handler.h" |
6 | 6 |
7 #include <ctype.h> | 7 #include <ctype.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "chrome/common/chrome_paths.h" | 43 #include "chrome/common/chrome_paths.h" |
44 #include "chrome/common/pref_names.h" | 44 #include "chrome/common/pref_names.h" |
45 #include "chrome/common/print_messages.h" | 45 #include "chrome/common/print_messages.h" |
46 #include "content/browser/renderer_host/render_view_host.h" | 46 #include "content/browser/renderer_host/render_view_host.h" |
47 #include "content/browser/tab_contents/tab_contents.h" | 47 #include "content/browser/tab_contents/tab_contents.h" |
48 #include "content/public/browser/browser_thread.h" | 48 #include "content/public/browser/browser_thread.h" |
49 #include "printing/backend/print_backend.h" | 49 #include "printing/backend/print_backend.h" |
50 #include "printing/metafile.h" | 50 #include "printing/metafile.h" |
51 #include "printing/metafile_impl.h" | 51 #include "printing/metafile_impl.h" |
52 #include "printing/page_range.h" | 52 #include "printing/page_range.h" |
| 53 #include "printing/page_size_margins.h" |
53 #include "printing/print_settings.h" | 54 #include "printing/print_settings.h" |
54 #include "unicode/ulocdata.h" | 55 #include "unicode/ulocdata.h" |
55 | 56 |
56 #if !defined(OS_CHROMEOS) | 57 #if !defined(OS_CHROMEOS) |
57 #include "base/command_line.h" | 58 #include "base/command_line.h" |
58 #include "chrome/common/chrome_switches.h" | 59 #include "chrome/common/chrome_switches.h" |
59 #endif | 60 #endif |
60 | 61 |
61 using content::BrowserThread; | 62 using content::BrowserThread; |
62 | 63 |
(...skipping 26 matching lines...) Expand all Loading... |
89 void ReportUserActionHistogram(enum UserActionBuckets event) { | 90 void ReportUserActionHistogram(enum UserActionBuckets event) { |
90 UMA_HISTOGRAM_ENUMERATION("PrintPreview.UserAction", event, | 91 UMA_HISTOGRAM_ENUMERATION("PrintPreview.UserAction", event, |
91 USERACTION_BUCKET_BOUNDARY); | 92 USERACTION_BUCKET_BOUNDARY); |
92 } | 93 } |
93 | 94 |
94 void ReportPrintSettingHistogram(enum PrintSettingsBuckets setting) { | 95 void ReportPrintSettingHistogram(enum PrintSettingsBuckets setting) { |
95 UMA_HISTOGRAM_ENUMERATION("PrintPreview.PrintSettings", setting, | 96 UMA_HISTOGRAM_ENUMERATION("PrintPreview.PrintSettings", setting, |
96 PRINT_SETTINGS_BUCKET_BOUNDARY); | 97 PRINT_SETTINGS_BUCKET_BOUNDARY); |
97 } | 98 } |
98 | 99 |
| 100 // Name of a dictionary fielad holdong cloud print related data; |
| 101 const char kCloudPrintData[] = "cloudPrintData"; |
| 102 // Name of a dictionary field holding the initiator tab title. |
| 103 const char kInitiatorTabTitle[] = "initiatorTabTitle"; |
| 104 // Name of a dictionary field holding the measurement system according to the |
| 105 // locale. |
| 106 const char kMeasurementSystem[] = "measurementSystem"; |
| 107 // Name of a dictionary field holding the number format according to the locale. |
| 108 const char kNumberFormat[] = "numberFormat"; |
| 109 |
| 110 |
99 // Get the print job settings dictionary from |args|. The caller takes | 111 // Get the print job settings dictionary from |args|. The caller takes |
100 // ownership of the returned DictionaryValue. Returns NULL on failure. | 112 // ownership of the returned DictionaryValue. Returns NULL on failure. |
101 DictionaryValue* GetSettingsDictionary(const ListValue* args) { | 113 DictionaryValue* GetSettingsDictionary(const ListValue* args) { |
102 std::string json_str; | 114 std::string json_str; |
103 if (!args->GetString(0, &json_str)) { | 115 if (!args->GetString(0, &json_str)) { |
104 NOTREACHED() << "Could not read JSON argument"; | 116 NOTREACHED() << "Could not read JSON argument"; |
105 return NULL; | 117 return NULL; |
106 } | 118 } |
107 if (json_str.empty()) { | 119 if (json_str.empty()) { |
108 NOTREACHED() << "Empty print job settings"; | 120 NOTREACHED() << "Empty print job settings"; |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 }; | 211 }; |
200 | 212 |
201 // static | 213 // static |
202 FilePath* PrintPreviewHandler::last_saved_path_ = NULL; | 214 FilePath* PrintPreviewHandler::last_saved_path_ = NULL; |
203 std::string* PrintPreviewHandler::last_used_printer_cloud_print_data_ = NULL; | 215 std::string* PrintPreviewHandler::last_used_printer_cloud_print_data_ = NULL; |
204 std::string* PrintPreviewHandler::last_used_printer_name_ = NULL; | 216 std::string* PrintPreviewHandler::last_used_printer_name_ = NULL; |
205 printing::ColorModels PrintPreviewHandler::last_used_color_model_ = | 217 printing::ColorModels PrintPreviewHandler::last_used_color_model_ = |
206 printing::UNKNOWN_COLOR_MODEL; | 218 printing::UNKNOWN_COLOR_MODEL; |
207 printing::MarginType PrintPreviewHandler::last_used_margins_type_ = | 219 printing::MarginType PrintPreviewHandler::last_used_margins_type_ = |
208 printing::DEFAULT_MARGINS; | 220 printing::DEFAULT_MARGINS; |
| 221 printing::PageSizeMargins* |
| 222 PrintPreviewHandler::last_used_page_size_margins_ = NULL; |
209 | 223 |
210 PrintPreviewHandler::PrintPreviewHandler() | 224 PrintPreviewHandler::PrintPreviewHandler() |
211 : print_backend_(printing::PrintBackend::CreateInstance(NULL)), | 225 : print_backend_(printing::PrintBackend::CreateInstance(NULL)), |
212 regenerate_preview_request_count_(0), | 226 regenerate_preview_request_count_(0), |
213 manage_printers_dialog_request_count_(0), | 227 manage_printers_dialog_request_count_(0), |
214 reported_failed_preview_(false), | 228 reported_failed_preview_(false), |
215 has_logged_printers_count_(false) { | 229 has_logged_printers_count_(false) { |
216 ReportUserActionHistogram(PREVIEW_STARTED); | 230 ReportUserActionHistogram(PREVIEW_STARTED); |
217 } | 231 } |
218 | 232 |
219 PrintPreviewHandler::~PrintPreviewHandler() { | 233 PrintPreviewHandler::~PrintPreviewHandler() { |
220 if (select_file_dialog_.get()) | 234 if (select_file_dialog_.get()) |
221 select_file_dialog_->ListenerDestroyed(); | 235 select_file_dialog_->ListenerDestroyed(); |
222 } | 236 } |
223 | 237 |
224 void PrintPreviewHandler::RegisterMessages() { | 238 void PrintPreviewHandler::RegisterMessages() { |
225 web_ui_->RegisterMessageCallback("getDefaultPrinter", | |
226 base::Bind(&PrintPreviewHandler::HandleGetDefaultPrinter, | |
227 base::Unretained(this))); | |
228 web_ui_->RegisterMessageCallback("getPrinters", | 239 web_ui_->RegisterMessageCallback("getPrinters", |
229 base::Bind(&PrintPreviewHandler::HandleGetPrinters, | 240 base::Bind(&PrintPreviewHandler::HandleGetPrinters, |
230 base::Unretained(this))); | 241 base::Unretained(this))); |
231 web_ui_->RegisterMessageCallback("getPreview", | 242 web_ui_->RegisterMessageCallback("getPreview", |
232 base::Bind(&PrintPreviewHandler::HandleGetPreview, | 243 base::Bind(&PrintPreviewHandler::HandleGetPreview, |
233 base::Unretained(this))); | 244 base::Unretained(this))); |
234 web_ui_->RegisterMessageCallback("print", | 245 web_ui_->RegisterMessageCallback("print", |
235 base::Bind(&PrintPreviewHandler::HandlePrint, | 246 base::Bind(&PrintPreviewHandler::HandlePrint, |
236 base::Unretained(this))); | 247 base::Unretained(this))); |
237 web_ui_->RegisterMessageCallback("getPrinterCapabilities", | 248 web_ui_->RegisterMessageCallback("getPrinterCapabilities", |
(...skipping 19 matching lines...) Expand all Loading... |
257 base::Unretained(this))); | 268 base::Unretained(this))); |
258 web_ui_->RegisterMessageCallback("hidePreview", | 269 web_ui_->RegisterMessageCallback("hidePreview", |
259 base::Bind(&PrintPreviewHandler::HandleHidePreview, | 270 base::Bind(&PrintPreviewHandler::HandleHidePreview, |
260 base::Unretained(this))); | 271 base::Unretained(this))); |
261 web_ui_->RegisterMessageCallback("cancelPendingPrintRequest", | 272 web_ui_->RegisterMessageCallback("cancelPendingPrintRequest", |
262 base::Bind(&PrintPreviewHandler::HandleCancelPendingPrintRequest, | 273 base::Bind(&PrintPreviewHandler::HandleCancelPendingPrintRequest, |
263 base::Unretained(this))); | 274 base::Unretained(this))); |
264 web_ui_->RegisterMessageCallback("saveLastPrinter", | 275 web_ui_->RegisterMessageCallback("saveLastPrinter", |
265 base::Bind(&PrintPreviewHandler::HandleSaveLastPrinter, | 276 base::Bind(&PrintPreviewHandler::HandleSaveLastPrinter, |
266 base::Unretained(this))); | 277 base::Unretained(this))); |
267 web_ui_->RegisterMessageCallback("getInitiatorTabTitle", | 278 web_ui_->RegisterMessageCallback("getInitialSettings", |
268 base::Bind(&PrintPreviewHandler::HandleGetInitiatorTabTitle, | 279 base::Bind(&PrintPreviewHandler::HandleGetInitialSettings, |
269 base::Unretained(this))); | 280 base::Unretained(this))); |
270 web_ui_->RegisterMessageCallback("getNumberFormatAndMeasurementSystem", | |
271 base::Bind( | |
272 &PrintPreviewHandler::HandleGetNumberFormatAndMeasurementSystem, | |
273 base::Unretained(this))); | |
274 } | 281 } |
275 | 282 |
276 TabContentsWrapper* PrintPreviewHandler::preview_tab_wrapper() const { | 283 TabContentsWrapper* PrintPreviewHandler::preview_tab_wrapper() const { |
277 return TabContentsWrapper::GetCurrentWrapperForContents(preview_tab()); | 284 return TabContentsWrapper::GetCurrentWrapperForContents(preview_tab()); |
278 } | 285 } |
279 TabContents* PrintPreviewHandler::preview_tab() const { | 286 TabContents* PrintPreviewHandler::preview_tab() const { |
280 return web_ui_->tab_contents(); | 287 return web_ui_->tab_contents(); |
281 } | 288 } |
282 | 289 |
283 void PrintPreviewHandler::HandleGetDefaultPrinter(const ListValue* /*args*/) { | |
284 scoped_refptr<PrintSystemTaskProxy> task = | |
285 new PrintSystemTaskProxy(AsWeakPtr(), | |
286 print_backend_.get(), | |
287 has_logged_printers_count_); | |
288 BrowserThread::PostTask( | |
289 BrowserThread::FILE, FROM_HERE, | |
290 base::Bind(&PrintSystemTaskProxy::GetDefaultPrinter, task.get())); | |
291 } | |
292 | |
293 void PrintPreviewHandler::HandleGetPrinters(const ListValue* /*args*/) { | 290 void PrintPreviewHandler::HandleGetPrinters(const ListValue* /*args*/) { |
294 scoped_refptr<PrintSystemTaskProxy> task = | 291 scoped_refptr<PrintSystemTaskProxy> task = |
295 new PrintSystemTaskProxy(AsWeakPtr(), | 292 new PrintSystemTaskProxy(AsWeakPtr(), |
296 print_backend_.get(), | 293 print_backend_.get(), |
297 has_logged_printers_count_); | 294 has_logged_printers_count_); |
298 has_logged_printers_count_ = true; | 295 has_logged_printers_count_ = true; |
299 | 296 |
300 BrowserThread::PostTask( | 297 BrowserThread::PostTask( |
301 BrowserThread::FILE, FROM_HERE, | 298 BrowserThread::FILE, FROM_HERE, |
302 base::Bind(&PrintSystemTaskProxy::EnumeratePrinters, task.get())); | 299 base::Bind(&PrintSystemTaskProxy::EnumeratePrinters, task.get())); |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 if (!settings.get()) | 387 if (!settings.get()) |
391 return; | 388 return; |
392 | 389 |
393 // Storing last used color model. | 390 // Storing last used color model. |
394 int color_model; | 391 int color_model; |
395 if (!settings->GetInteger(printing::kSettingColor, &color_model)) | 392 if (!settings->GetInteger(printing::kSettingColor, &color_model)) |
396 color_model = printing::GRAY; | 393 color_model = printing::GRAY; |
397 last_used_color_model_ = static_cast<printing::ColorModels>(color_model); | 394 last_used_color_model_ = static_cast<printing::ColorModels>(color_model); |
398 | 395 |
399 // Storing last used margin settings. | 396 // Storing last used margin settings. |
400 int margin_type; | 397 bool is_modifiable; |
401 if (!settings->GetInteger(printing::kSettingMarginsType, &margin_type)) | 398 settings->GetBoolean(printing::kSettingPreviewModifiable, &is_modifiable); |
402 margin_type = printing::DEFAULT_MARGINS; | 399 if (is_modifiable) { |
403 last_used_margins_type_ = static_cast<printing::MarginType>(margin_type); | 400 int margin_type; |
| 401 if (!settings->GetInteger(printing::kSettingMarginsType, &margin_type)) |
| 402 margin_type = printing::DEFAULT_MARGINS; |
| 403 last_used_margins_type_ = static_cast<printing::MarginType>(margin_type); |
| 404 if (last_used_margins_type_ == printing::CUSTOM_MARGINS) { |
| 405 if (!last_used_page_size_margins_) |
| 406 last_used_page_size_margins_ = new printing::PageSizeMargins(); |
| 407 getCustomMarginsFromJobSettings(*settings, last_used_page_size_margins_); |
| 408 } |
| 409 } |
404 | 410 |
405 bool print_to_pdf = false; | 411 bool print_to_pdf = false; |
406 settings->GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf); | 412 settings->GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf); |
407 | 413 |
408 settings->SetBoolean(printing::kSettingHeaderFooterEnabled, false); | 414 settings->SetBoolean(printing::kSettingHeaderFooterEnabled, false); |
409 | 415 |
410 bool is_cloud_printer = settings->HasKey(printing::kSettingCloudPrintId); | 416 bool is_cloud_printer = settings->HasKey(printing::kSettingCloudPrintId); |
411 bool is_cloud_dialog = false; | 417 bool is_cloud_dialog = false; |
412 settings->GetBoolean(printing::kSettingCloudPrintDialog, &is_cloud_dialog); | 418 settings->GetBoolean(printing::kSettingCloudPrintDialog, &is_cloud_dialog); |
413 if (is_cloud_printer) { | 419 if (is_cloud_printer) { |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 regenerate_preview_request_count_); | 612 regenerate_preview_request_count_); |
607 | 613 |
608 ActivateInitiatorTabAndClosePreviewTab(); | 614 ActivateInitiatorTabAndClosePreviewTab(); |
609 } | 615 } |
610 | 616 |
611 void PrintPreviewHandler::ReportStats() { | 617 void PrintPreviewHandler::ReportStats() { |
612 UMA_HISTOGRAM_COUNTS("PrintPreview.ManagePrinters", | 618 UMA_HISTOGRAM_COUNTS("PrintPreview.ManagePrinters", |
613 manage_printers_dialog_request_count_); | 619 manage_printers_dialog_request_count_); |
614 } | 620 } |
615 | 621 |
616 void PrintPreviewHandler::HandleGetInitiatorTabTitle( | 622 void PrintPreviewHandler::GetNumberFormatAndMeasurementSystem( |
617 const ListValue* /*args*/) { | 623 base::DictionaryValue* settings) { |
618 PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_); | |
619 base::StringValue tab_title(print_preview_ui->initiator_tab_title()); | |
620 web_ui_->CallJavascriptFunction("setInitiatorTabTitle", tab_title); | |
621 } | |
622 | |
623 void PrintPreviewHandler::HandleGetNumberFormatAndMeasurementSystem( | |
624 const ListValue* /*args*/) { | |
625 | 624 |
626 // Getting the measurement system based on the locale. | 625 // Getting the measurement system based on the locale. |
627 UErrorCode errorCode = U_ZERO_ERROR; | 626 UErrorCode errorCode = U_ZERO_ERROR; |
628 const char* locale = g_browser_process->GetApplicationLocale().c_str(); | 627 const char* locale = g_browser_process->GetApplicationLocale().c_str(); |
629 UMeasurementSystem measurement_system = | 628 UMeasurementSystem system = ulocdata_getMeasurementSystem(locale, &errorCode); |
630 ulocdata_getMeasurementSystem(locale, &errorCode); | 629 if (errorCode > U_ZERO_ERROR || system == UMS_LIMIT) |
631 if (errorCode > U_ZERO_ERROR || measurement_system == UMS_LIMIT) | 630 system = UMS_SI; |
632 measurement_system = UMS_SI; | |
633 | 631 |
634 // Getting the number formatting based on the locale. | 632 // Getting the number formatting based on the locale and writing to |
635 StringValue number_format(base::FormatDouble(123456.78, 2)); | 633 // dictionary. |
636 base::FundamentalValue system(measurement_system); | 634 settings->SetString(kNumberFormat, base::FormatDouble(123456.78, 2)); |
| 635 settings->SetInteger(kMeasurementSystem, system); |
| 636 } |
637 | 637 |
638 web_ui_->CallJavascriptFunction( | 638 void PrintPreviewHandler::GetLastUsedMarginSettings( |
639 "print_preview.setNumberFormatAndMeasurementSystem", | 639 base::DictionaryValue* custom_margins) { |
640 number_format, | 640 custom_margins->SetInteger(printing::kSettingMarginsType, |
641 system); | 641 PrintPreviewHandler::last_used_margins_type_); |
| 642 if (last_used_page_size_margins_) { |
| 643 custom_margins->SetDouble(printing::kSettingMarginTop, |
| 644 last_used_page_size_margins_->margin_top); |
| 645 custom_margins->SetDouble(printing::kSettingMarginBottom, |
| 646 last_used_page_size_margins_->margin_bottom); |
| 647 custom_margins->SetDouble(printing::kSettingMarginLeft, |
| 648 last_used_page_size_margins_->margin_left); |
| 649 custom_margins->SetDouble(printing::kSettingMarginRight, |
| 650 last_used_page_size_margins_->margin_right); |
| 651 } |
| 652 } |
| 653 |
| 654 void PrintPreviewHandler::HandleGetInitialSettings(const ListValue* /*args*/) { |
| 655 scoped_refptr<PrintSystemTaskProxy> task = |
| 656 new PrintSystemTaskProxy(AsWeakPtr(), |
| 657 print_backend_.get(), |
| 658 has_logged_printers_count_); |
| 659 BrowserThread::PostTask( |
| 660 BrowserThread::FILE, FROM_HERE, |
| 661 base::Bind(&PrintSystemTaskProxy::GetDefaultPrinter, task.get())); |
| 662 } |
| 663 |
| 664 void PrintPreviewHandler::SendInitialSettings( |
| 665 const std::string& default_printer, |
| 666 const std::string& cloud_print_data) { |
| 667 PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_); |
| 668 |
| 669 base::DictionaryValue initial_settings; |
| 670 initial_settings.SetString(kInitiatorTabTitle, |
| 671 print_preview_ui->initiator_tab_title()); |
| 672 initial_settings.SetBoolean(printing::kSettingPreviewModifiable, |
| 673 print_preview_ui->source_is_modifiable()); |
| 674 initial_settings.SetString(printing::kSettingPrinterName, |
| 675 default_printer); |
| 676 initial_settings.SetString(kCloudPrintData, cloud_print_data); |
| 677 |
| 678 if (print_preview_ui->source_is_modifiable()) { |
| 679 GetLastUsedMarginSettings(&initial_settings); |
| 680 GetNumberFormatAndMeasurementSystem(&initial_settings); |
| 681 } |
| 682 web_ui_->CallJavascriptFunction("setInitialSettings", initial_settings); |
642 } | 683 } |
643 | 684 |
644 void PrintPreviewHandler::ActivateInitiatorTabAndClosePreviewTab() { | 685 void PrintPreviewHandler::ActivateInitiatorTabAndClosePreviewTab() { |
645 TabContentsWrapper* initiator_tab = GetInitiatorTab(); | 686 TabContentsWrapper* initiator_tab = GetInitiatorTab(); |
646 if (initiator_tab) { | 687 if (initiator_tab) { |
647 static_cast<RenderViewHostDelegate*>( | 688 static_cast<RenderViewHostDelegate*>( |
648 initiator_tab->tab_contents())->Activate(); | 689 initiator_tab->tab_contents())->Activate(); |
649 } | 690 } |
650 ClosePrintPreviewTab(); | 691 ClosePrintPreviewTab(); |
651 } | 692 } |
652 | 693 |
653 void PrintPreviewHandler::SendPrinterCapabilities( | 694 void PrintPreviewHandler::SendPrinterCapabilities( |
654 const DictionaryValue& settings_info) { | 695 const DictionaryValue& settings_info) { |
655 VLOG(1) << "Get printer capabilities finished"; | 696 VLOG(1) << "Get printer capabilities finished"; |
656 web_ui_->CallJavascriptFunction("updateWithPrinterCapabilities", | 697 web_ui_->CallJavascriptFunction("updateWithPrinterCapabilities", |
657 settings_info); | 698 settings_info); |
658 } | 699 } |
659 | 700 |
660 void PrintPreviewHandler::SendDefaultPrinter( | |
661 const StringValue& default_printer, | |
662 const StringValue& cloud_print_data) { | |
663 base::FundamentalValue margins_type( | |
664 PrintPreviewHandler::last_used_margins_type_); | |
665 web_ui_->CallJavascriptFunction("setDefaultPrinter", | |
666 default_printer, | |
667 cloud_print_data, | |
668 margins_type); | |
669 } | |
670 | |
671 void PrintPreviewHandler::SetupPrinterList(const ListValue& printers) { | 701 void PrintPreviewHandler::SetupPrinterList(const ListValue& printers) { |
672 SendCloudPrintEnabled(); | 702 SendCloudPrintEnabled(); |
673 web_ui_->CallJavascriptFunction("setPrinters", printers); | 703 web_ui_->CallJavascriptFunction("setPrinters", printers); |
674 } | 704 } |
675 | 705 |
676 void PrintPreviewHandler::SendCloudPrintEnabled() { | 706 void PrintPreviewHandler::SendCloudPrintEnabled() { |
677 Profile* profile = BrowserList::GetLastActive()->profile(); | 707 Profile* profile = BrowserList::GetLastActive()->profile(); |
678 PrefService* prefs = profile->GetPrefs(); | 708 PrefService* prefs = profile->GetPrefs(); |
679 if (prefs->GetBoolean(prefs::kCloudPrintSubmitEnabled)) { | 709 if (prefs->GetBoolean(prefs::kCloudPrintSubmitEnabled)) { |
680 GURL gcp_url(CloudPrintURL(profile).GetCloudPrintServiceURL()); | 710 GURL gcp_url(CloudPrintURL(profile).GetCloudPrintServiceURL()); |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 return; | 898 return; |
869 | 899 |
870 // We no longer require the initiator tab details. Remove those details | 900 // We no longer require the initiator tab details. Remove those details |
871 // associated with the preview tab to allow the initiator tab to create | 901 // associated with the preview tab to allow the initiator tab to create |
872 // another preview tab. | 902 // another preview tab. |
873 printing::PrintPreviewTabController* tab_controller = | 903 printing::PrintPreviewTabController* tab_controller = |
874 printing::PrintPreviewTabController::GetInstance(); | 904 printing::PrintPreviewTabController::GetInstance(); |
875 if (tab_controller) | 905 if (tab_controller) |
876 tab_controller->EraseInitiatorTabInfo(preview_tab_wrapper()); | 906 tab_controller->EraseInitiatorTabInfo(preview_tab_wrapper()); |
877 } | 907 } |
OLD | NEW |