| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/service/service_process.h" | 5 #include "chrome/service/service_process.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 service_prefs_->SetString(prefs::kApplicationLocale, locale); | 173 service_prefs_->SetString(prefs::kApplicationLocale, locale); |
| 174 service_prefs_->WritePrefs(); | 174 service_prefs_->WritePrefs(); |
| 175 } else { | 175 } else { |
| 176 // If no command-line value was specified, read the last used locale from | 176 // If no command-line value was specified, read the last used locale from |
| 177 // the prefs. | 177 // the prefs. |
| 178 service_prefs_->GetString(prefs::kApplicationLocale, &locale); | 178 service_prefs_->GetString(prefs::kApplicationLocale, &locale); |
| 179 // If no locale was specified anywhere, use the default one. | 179 // If no locale was specified anywhere, use the default one. |
| 180 if (locale.empty()) | 180 if (locale.empty()) |
| 181 locale = kDefaultServiceProcessLocale; | 181 locale = kDefaultServiceProcessLocale; |
| 182 } | 182 } |
| 183 ResourceBundle::InitSharedInstanceWithLocale(locale); | 183 ResourceBundle::InitSharedInstanceWithLocale(locale, NULL); |
| 184 | 184 |
| 185 PrepareRestartOnCrashEnviroment(command_line); | 185 PrepareRestartOnCrashEnviroment(command_line); |
| 186 | 186 |
| 187 // Enable Cloud Print if needed. First check the command-line. | 187 // Enable Cloud Print if needed. First check the command-line. |
| 188 bool cloud_print_proxy_enabled = | 188 bool cloud_print_proxy_enabled = |
| 189 command_line.HasSwitch(switches::kEnableCloudPrintProxy); | 189 command_line.HasSwitch(switches::kEnableCloudPrintProxy); |
| 190 if (!cloud_print_proxy_enabled) { | 190 if (!cloud_print_proxy_enabled) { |
| 191 // Then check if the cloud print proxy was previously enabled. | 191 // Then check if the cloud print proxy was previously enabled. |
| 192 service_prefs_->GetBoolean(prefs::kCloudPrintProxyEnabled, | 192 service_prefs_->GetBoolean(prefs::kCloudPrintProxyEnabled, |
| 193 &cloud_print_proxy_enabled); | 193 &cloud_print_proxy_enabled); |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 if (enabled_services_ && !ipc_server_->is_client_connected()) { | 385 if (enabled_services_ && !ipc_server_->is_client_connected()) { |
| 386 GetCloudPrintProxy()->CheckCloudPrintProxyPolicy(); | 386 GetCloudPrintProxy()->CheckCloudPrintProxyPolicy(); |
| 387 } | 387 } |
| 388 ScheduleCloudPrintPolicyCheck(); | 388 ScheduleCloudPrintPolicyCheck(); |
| 389 } | 389 } |
| 390 | 390 |
| 391 ServiceProcess::~ServiceProcess() { | 391 ServiceProcess::~ServiceProcess() { |
| 392 Teardown(); | 392 Teardown(); |
| 393 g_service_process = NULL; | 393 g_service_process = NULL; |
| 394 } | 394 } |
| OLD | NEW |