Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/ui/webui/options/personal_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/personal_options_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 176 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_EXTENSIONS)); | 176 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_EXTENSIONS)); |
| 177 localized_strings->SetString("syncautofill", | 177 localized_strings->SetString("syncautofill", |
| 178 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_AUTOFILL)); | 178 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_AUTOFILL)); |
| 179 localized_strings->SetString("syncthemes", | 179 localized_strings->SetString("syncthemes", |
| 180 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_THEMES)); | 180 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_THEMES)); |
| 181 localized_strings->SetString("syncapps", | 181 localized_strings->SetString("syncapps", |
| 182 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_APPS)); | 182 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_APPS)); |
| 183 localized_strings->SetString("syncsearchengines", | 183 localized_strings->SetString("syncsearchengines", |
| 184 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SEARCH_ENGINES)); | 184 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SEARCH_ENGINES)); |
| 185 localized_strings->SetString("syncsessions", | 185 localized_strings->SetString("syncsessions", |
| 186 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_SESSIONS)); | 186 l10n_util::GetStringUTF16(IDS_SYNC_DATATYPE_TABS)); |
|
Nicolas Zea
2011/09/06 23:20:18
Same with this one, syncsessions doesn't seem to b
| |
| 187 | 187 |
| 188 #if defined(OS_CHROMEOS) | 188 #if defined(OS_CHROMEOS) |
| 189 localized_strings->SetString("account", | 189 localized_strings->SetString("account", |
| 190 l10n_util::GetStringUTF16(IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME)); | 190 l10n_util::GetStringUTF16(IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME)); |
| 191 localized_strings->SetString("enableScreenlock", | 191 localized_strings->SetString("enableScreenlock", |
| 192 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); | 192 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); |
| 193 localized_strings->SetString("changePicture", | 193 localized_strings->SetString("changePicture", |
| 194 l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE)); | 194 l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE)); |
| 195 localized_strings->SetString("userEmail", | 195 localized_strings->SetString("userEmail", |
| 196 chromeos::UserManager::Get()->logged_in_user().email()); | 196 chromeos::UserManager::Get()->logged_in_user().email()); |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 413 profile_info_list.Append(profile_value); | 413 profile_info_list.Append(profile_value); |
| 414 } | 414 } |
| 415 | 415 |
| 416 web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo", | 416 web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo", |
| 417 profile_info_list); | 417 profile_info_list); |
| 418 } | 418 } |
| 419 | 419 |
| 420 void PersonalOptionsHandler::CreateProfile(const ListValue* args) { | 420 void PersonalOptionsHandler::CreateProfile(const ListValue* args) { |
| 421 ProfileManager::CreateMultiProfileAsync(); | 421 ProfileManager::CreateMultiProfileAsync(); |
| 422 } | 422 } |
| OLD | NEW |