summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 01:50:11 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 01:50:11 +0000
commitede33b43e3759e5a267b1ca88e5750abb0d8b307 (patch)
treef48a36e6ad0b2afb06b256e094cb4fa923a7818c /printing
parent452fb1414f6efba42085b6f448f892a63f02fbe5 (diff)
downloadchromium_src-ede33b43e3759e5a267b1ca88e5750abb0d8b307.zip
chromium_src-ede33b43e3759e5a267b1ca88e5750abb0d8b307.tar.gz
chromium_src-ede33b43e3759e5a267b1ca88e5750abb0d8b307.tar.bz2
Use JS Date().toLocaleDateString() to format date in header. Fixed issues with local date formats.
Remove date from printing settings. BUG=103111 Review URL: https://codereview.chromium.org/30443003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/print_settings.cc1
-rw-r--r--printing/print_settings.h1
-rw-r--r--printing/print_settings_initializer.cc3
3 files changed, 0 insertions, 5 deletions
diff --git a/printing/print_settings.cc b/printing/print_settings.cc
index f024d2a..05a7869 100644
--- a/printing/print_settings.cc
+++ b/printing/print_settings.cc
@@ -132,7 +132,6 @@ void PrintSettings::Clear() {
max_shrink = 2.;
desired_dpi = 72;
selection_only = false;
- date = base::string16();
title = base::string16();
url = base::string16();
display_header_footer = false;
diff --git a/printing/print_settings.h b/printing/print_settings.h
index f177699..cba378e 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -109,7 +109,6 @@ class PRINTING_EXPORT PrintSettings {
void SetOrientation(bool landscape);
// Strings to be printed as headers and footers if requested by the user.
- base::string16 date;
base::string16 title;
base::string16 url;
diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
index 9932536..67afc10 100644
--- a/printing/print_settings_initializer.cc
+++ b/printing/print_settings_initializer.cc
@@ -8,7 +8,6 @@
#include <cmath>
#include <string>
-#include "base/i18n/time_formatting.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -33,7 +32,6 @@ void PrintSettingsInitializer::InitHeaderFooterStrings(
if (!print_settings->display_header_footer)
return;
- base::string16 date = base::TimeFormatShortDateNumeric(base::Time::Now());
base::string16 title;
base::string16 url;
if (!job_settings.GetString(kSettingHeaderFooterTitle, &title) ||
@@ -41,7 +39,6 @@ void PrintSettingsInitializer::InitHeaderFooterStrings(
NOTREACHED();
}
- print_settings->date = date;
print_settings->title = title;
const gfx::FontList& default_fonts =
ui::ResourceBundle::GetSharedInstance().GetFontList(