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

Unified Diff: printing/printing_context.cc

Issue 8334007: Cleanup: Remove unneeded namespaces. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 2 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 | « printing/printed_document_win.cc ('k') | printing/printing_context_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing_context.cc
===================================================================
--- printing/printing_context.cc (revision 105978)
+++ printing/printing_context.cc (working copy)
@@ -46,13 +46,13 @@
const PageRanges& ranges) {
ResetSettings();
- if (!job_settings.GetBoolean(printing::kSettingHeaderFooterEnabled,
+ if (!job_settings.GetBoolean(kSettingHeaderFooterEnabled,
&settings_.display_header_footer)) {
NOTREACHED();
}
int margin_type = DEFAULT_MARGINS;
- if (!job_settings.GetInteger(printing::kSettingMarginsType, &margin_type) ||
+ if (!job_settings.GetInteger(kSettingMarginsType, &margin_type) ||
(margin_type != DEFAULT_MARGINS &&
margin_type != NO_MARGINS &&
margin_type != CUSTOM_MARGINS &&
@@ -67,15 +67,13 @@
double left_margin_in_points = 0;
double right_margin_in_points = 0;
DictionaryValue* custom_margins;
- if (!job_settings.GetDictionary(printing::kSettingMarginsCustom,
- &custom_margins) ||
- !custom_margins->GetDouble(printing::kSettingMarginTop,
- &top_margin_in_points) ||
- !custom_margins->GetDouble(printing::kSettingMarginBottom,
+ if (!job_settings.GetDictionary(kSettingMarginsCustom, &custom_margins) ||
+ !custom_margins->GetDouble(kSettingMarginTop, &top_margin_in_points) ||
+ !custom_margins->GetDouble(kSettingMarginBottom,
&bottom_margin_in_points) ||
- !custom_margins->GetDouble(printing::kSettingMarginLeft,
+ !custom_margins->GetDouble(kSettingMarginLeft,
&left_margin_in_points) ||
- !custom_margins->GetDouble(printing::kSettingMarginRight,
+ !custom_margins->GetDouble(kSettingMarginRight,
&right_margin_in_points)) {
NOTREACHED();
}
@@ -90,8 +88,7 @@
}
PrintingContext::Result result = UpdatePrinterSettings(job_settings, ranges);
- printing::PrintSettingsInitializer::InitHeaderFooterStrings(job_settings,
- &settings_);
+ PrintSettingsInitializer::InitHeaderFooterStrings(job_settings, &settings_);
return result;
}
« no previous file with comments | « printing/printed_document_win.cc ('k') | printing/printing_context_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698