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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 #else | 140 #else |
141 localized_strings->SetString("themes", | 141 localized_strings->SetString("themes", |
142 l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME)); | 142 l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME)); |
143 localized_strings->SetString("themesReset", | 143 localized_strings->SetString("themesReset", |
144 l10n_util::GetStringUTF16(IDS_THEMES_RESET_BUTTON)); | 144 l10n_util::GetStringUTF16(IDS_THEMES_RESET_BUTTON)); |
145 #endif | 145 #endif |
146 | 146 |
147 // Sync select control. | 147 // Sync select control. |
148 ListValue* sync_select_list = new ListValue; | 148 ListValue* sync_select_list = new ListValue; |
149 ListValue* datatypes = new ListValue; | 149 ListValue* datatypes = new ListValue; |
150 datatypes->Append(Value::CreateBooleanValue(false)); | 150 datatypes->Append(base::FalseValue()); |
151 datatypes->Append( | 151 datatypes->Append( |
152 Value::CreateStringValue( | 152 Value::CreateStringValue( |
153 l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_DATATYPES))); | 153 l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_DATATYPES))); |
154 sync_select_list->Append(datatypes); | 154 sync_select_list->Append(datatypes); |
155 ListValue* everything = new ListValue; | 155 ListValue* everything = new ListValue; |
156 everything->Append(Value::CreateBooleanValue(true)); | 156 everything->Append(base::TrueValue()); |
157 everything->Append( | 157 everything->Append( |
158 Value::CreateStringValue( | 158 Value::CreateStringValue( |
159 l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_EVERYTHING))); | 159 l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_EVERYTHING))); |
160 sync_select_list->Append(everything); | 160 sync_select_list->Append(everything); |
161 localized_strings->Set("syncSelectList", sync_select_list); | 161 localized_strings->Set("syncSelectList", sync_select_list); |
162 | 162 |
163 // Sync page. | 163 // Sync page. |
164 localized_strings->SetString("syncPage", | 164 localized_strings->SetString("syncPage", |
165 l10n_util::GetStringUTF16(IDS_SYNC_NTP_SYNC_SECTION_TITLE)); | 165 l10n_util::GetStringUTF16(IDS_SYNC_NTP_SYNC_SECTION_TITLE)); |
166 localized_strings->SetString("sync_title", | 166 localized_strings->SetString("sync_title", |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
434 } | 434 } |
435 | 435 |
436 web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo", | 436 web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo", |
437 profile_info_list); | 437 profile_info_list); |
438 } | 438 } |
439 | 439 |
440 void PersonalOptionsHandler::CreateProfile(const ListValue* args) { | 440 void PersonalOptionsHandler::CreateProfile(const ListValue* args) { |
441 ProfileManager::CreateMultiProfileAsync(); | 441 ProfileManager::CreateMultiProfileAsync(); |
442 } | 442 } |
443 | 443 |
OLD | NEW |