diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 18:58:36 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 18:58:36 +0000 |
| commit | 8b3858172120d9e726757714567b50d753119812 (patch) | |
| tree | 7627a032d28d7a47095e33ac53b62e99308cc430 /printing | |
| parent | 47adc7b3d2d64e323d14d2236f7a7a71f8eb0ae8 (diff) | |
| download | chromium_src-8b3858172120d9e726757714567b50d753119812.zip chromium_src-8b3858172120d9e726757714567b50d753119812.tar.gz chromium_src-8b3858172120d9e726757714567b50d753119812.tar.bz2 | |
Removed invalid NOTREACHED.
It's possible when new Chrome opened on profile created with older one that had no support of this option.
TBR=gene
Review URL: https://chromiumcodereview.appspot.com/12207199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printing_context.cc | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/printing/printing_context.cc b/printing/printing_context.cc index 407e3bb..98ea11c 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc @@ -47,10 +47,8 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings( const PageRanges& ranges) { ResetSettings(); - if (!job_settings.GetBoolean(kSettingHeaderFooterEnabled, - &settings_.display_header_footer)) { - NOTREACHED(); - } + job_settings.GetBoolean(kSettingHeaderFooterEnabled, + &settings_.display_header_footer); int margin_type = DEFAULT_MARGINS; if (!job_settings.GetInteger(kSettingMarginsType, &margin_type) || @@ -58,7 +56,7 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings( margin_type != NO_MARGINS && margin_type != CUSTOM_MARGINS && margin_type != PRINTABLE_AREA_MARGINS)) { - NOTREACHED(); + margin_type = DEFAULT_MARGINS; } settings_.margin_type = static_cast<MarginType>(margin_type); @@ -79,16 +77,10 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings( PrintingContext::Result result = UpdatePrinterSettings(job_settings, ranges); PrintSettingsInitializer::InitHeaderFooterStrings(job_settings, &settings_); - if (!job_settings.GetBoolean(kSettingShouldPrintBackgrounds, - &settings_.should_print_backgrounds)) { - NOTREACHED(); - } - - if (!job_settings.GetBoolean(kSettingShouldPrintSelectionOnly, - &settings_.selection_only)) { - NOTREACHED(); - } - + job_settings.GetBoolean(kSettingShouldPrintBackgrounds, + &settings_.should_print_backgrounds); + job_settings.GetBoolean(kSettingShouldPrintSelectionOnly, + &settings_.selection_only); return result; } |