Commit bd92cc08 authored by thestig@chromium.org's avatar thestig@chromium.org

Cleanup: Fix some style nits in print preview WebUI code.

Review URL: https://codereview.chromium.org/314113006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275409 0039d316-1c4b-4281-b951-d872f2087c98
parent 00e9a6ec
...@@ -637,7 +637,7 @@ void PrintPreviewHandler::RegisterMessages() { ...@@ -637,7 +637,7 @@ void PrintPreviewHandler::RegisterMessages() {
bool PrintPreviewHandler::PrivetPrintingEnabled() { bool PrintPreviewHandler::PrivetPrintingEnabled() {
#if defined(ENABLE_SERVICE_DISCOVERY) #if defined(ENABLE_SERVICE_DISCOVERY)
return !CommandLine::ForCurrentProcess()->HasSwitch( return !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableDeviceDiscovery); switches::kDisableDeviceDiscovery);
#else #else
return false; return false;
...@@ -1191,11 +1191,12 @@ void PrintPreviewHandler::SendInitialSettings( ...@@ -1191,11 +1191,12 @@ void PrintPreviewHandler::SendInitialSettings(
printing::StickySettings* sticky_settings = GetStickySettings(); printing::StickySettings* sticky_settings = GetStickySettings();
sticky_settings->RestoreFromPrefs(Profile::FromBrowserContext( sticky_settings->RestoreFromPrefs(Profile::FromBrowserContext(
preview_web_contents()->GetBrowserContext())->GetPrefs()); preview_web_contents()->GetBrowserContext())->GetPrefs());
if (sticky_settings->printer_app_state()) if (sticky_settings->printer_app_state()) {
initial_settings.SetString(kAppState, initial_settings.SetString(kAppState,
*sticky_settings->printer_app_state()); *sticky_settings->printer_app_state());
}
CommandLine* cmdline = CommandLine::ForCurrentProcess(); base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
initial_settings.SetBoolean(kPrintAutomaticallyInKioskMode, initial_settings.SetBoolean(kPrintAutomaticallyInKioskMode,
cmdline->HasSwitch(switches::kKioskModePrinting)); cmdline->HasSwitch(switches::kKioskModePrinting));
#if defined(OS_WIN) #if defined(OS_WIN)
...@@ -1460,7 +1461,7 @@ void PrintPreviewHandler::ConvertColorSettingToCUPSColorModel( ...@@ -1460,7 +1461,7 @@ void PrintPreviewHandler::ConvertColorSettingToCUPSColorModel(
settings->SetInteger(printing::kSettingColor, color_model); settings->SetInteger(printing::kSettingColor, color_model);
} }
#endif #endif // defined(USE_CUPS)
#if defined(ENABLE_SERVICE_DISCOVERY) #if defined(ENABLE_SERVICE_DISCOVERY)
void PrintPreviewHandler::LocalPrinterChanged( void PrintPreviewHandler::LocalPrinterChanged(
...@@ -1468,7 +1469,7 @@ void PrintPreviewHandler::LocalPrinterChanged( ...@@ -1468,7 +1469,7 @@ void PrintPreviewHandler::LocalPrinterChanged(
const std::string& name, const std::string& name,
bool has_local_printing, bool has_local_printing,
const local_discovery::DeviceDescription& description) { const local_discovery::DeviceDescription& description) {
CommandLine* command_line = CommandLine::ForCurrentProcess(); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (has_local_printing || if (has_local_printing ||
command_line->HasSwitch(switches::kEnablePrintPreviewRegisterPromos)) { command_line->HasSwitch(switches::kEnablePrintPreviewRegisterPromos)) {
base::DictionaryValue info; base::DictionaryValue info;
...@@ -1649,7 +1650,7 @@ void PrintPreviewHandler::FillPrinterDescription( ...@@ -1649,7 +1650,7 @@ void PrintPreviewHandler::FillPrinterDescription(
const local_discovery::DeviceDescription& description, const local_discovery::DeviceDescription& description,
bool has_local_printing, bool has_local_printing,
base::DictionaryValue* printer_value) { base::DictionaryValue* printer_value) {
CommandLine* command_line = CommandLine::ForCurrentProcess(); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
printer_value->SetString("serviceName", name); printer_value->SetString("serviceName", name);
printer_value->SetString("name", description.name); printer_value->SetString("name", description.name);
...@@ -1661,4 +1662,4 @@ void PrintPreviewHandler::FillPrinterDescription( ...@@ -1661,4 +1662,4 @@ void PrintPreviewHandler::FillPrinterDescription(
printer_value->SetString("cloudID", description.id); printer_value->SetString("cloudID", description.id);
} }
#endif #endif // defined(ENABLE_SERVICE_DISCOVERY)
...@@ -236,8 +236,8 @@ content::WebUIDataSource* CreatePrintPreviewUISource() { ...@@ -236,8 +236,8 @@ content::WebUIDataSource* CreatePrintPreviewUISource() {
source->AddString( source->AddString(
"printWithCloudPrintWait", "printWithCloudPrintWait",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_PRINT_PREVIEW_PRINT_WITH_CLOUD_PRINT_WAIT, IDS_PRINT_PREVIEW_PRINT_WITH_CLOUD_PRINT_WAIT,
l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
source->AddString( source->AddString(
"noDestsPromoLearnMoreUrl", "noDestsPromoLearnMoreUrl",
chrome::kCloudPrintNoDestinationsLearnMoreURL); chrome::kCloudPrintNoDestinationsLearnMoreURL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment