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

Side by Side Diff: chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Issue 2812953002: Stop passing raw pointers to base::Value API in c/b/ui (Closed)
Patch Set: No ListValue::SetDouble Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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/browser/ui/webui/options/clear_browser_data_handler.h" 5 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 "clearBrowserDataHistoryFooter", 192 "clearBrowserDataHistoryFooter",
193 l10n_util::GetStringFUTF16( 193 l10n_util::GetStringFUTF16(
194 IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER, 194 IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER,
195 base::ASCIIToUTF16(kMyActivityUrlInFooter))); 195 base::ASCIIToUTF16(kMyActivityUrlInFooter)));
196 localized_strings->SetString( 196 localized_strings->SetString(
197 "clearBrowserDataHistoryNotice", 197 "clearBrowserDataHistoryNotice",
198 l10n_util::GetStringFUTF16( 198 l10n_util::GetStringFUTF16(
199 IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE, 199 IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE,
200 base::ASCIIToUTF16(kMyActivityUrlInDialog))); 200 base::ASCIIToUTF16(kMyActivityUrlInDialog)));
201 201
202 base::ListValue* time_list = new base::ListValue; 202 auto time_list = base::MakeUnique<base::ListValue>();
203 for (int i = 0; i < 5; i++) { 203 for (int i = 0; i < 5; i++) {
204 base::string16 label_string; 204 base::string16 label_string;
205 switch (i) { 205 switch (i) {
206 case 0: 206 case 0:
207 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_HOUR); 207 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_HOUR);
208 break; 208 break;
209 case 1: 209 case 1:
210 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DAY); 210 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DAY);
211 break; 211 break;
212 case 2: 212 case 2:
213 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_WEEK); 213 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_WEEK);
214 break; 214 break;
215 case 3: 215 case 3:
216 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_4WEEKS); 216 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_4WEEKS);
217 break; 217 break;
218 case 4: 218 case 4:
219 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_EVERYTHING); 219 label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_EVERYTHING);
220 break; 220 break;
221 } 221 }
222 std::unique_ptr<base::ListValue> option(new base::ListValue()); 222 std::unique_ptr<base::ListValue> option(new base::ListValue());
223 option->AppendInteger(i); 223 option->AppendInteger(i);
224 option->AppendString(label_string); 224 option->AppendString(label_string);
225 time_list->Append(std::move(option)); 225 time_list->Append(std::move(option));
226 } 226 }
227 localized_strings->Set("clearBrowserDataTimeList", time_list); 227 localized_strings->Set("clearBrowserDataTimeList", std::move(time_list));
228 localized_strings->SetBoolean("showDeleteBrowsingHistoryCheckboxes", 228 localized_strings->SetBoolean("showDeleteBrowsingHistoryCheckboxes",
229 !Profile::FromWebUI(web_ui())->IsSupervised()); 229 !Profile::FromWebUI(web_ui())->IsSupervised());
230 } 230 }
231 231
232 void ClearBrowserDataHandler::RegisterMessages() { 232 void ClearBrowserDataHandler::RegisterMessages() {
233 // Setup handlers specific to this panel. 233 // Setup handlers specific to this panel.
234 web_ui()->RegisterMessageCallback("performClearBrowserData", 234 web_ui()->RegisterMessageCallback("performClearBrowserData",
235 base::Bind(&ClearBrowserDataHandler::HandleClearBrowserData, 235 base::Bind(&ClearBrowserDataHandler::HandleClearBrowserData,
236 base::Unretained(this))); 236 base::Unretained(this)));
237 web_ui()->RegisterMessageCallback("openedClearBrowserData", 237 web_ui()->RegisterMessageCallback("openedClearBrowserData",
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated", 433 "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated",
434 should_show_history_notice_); 434 should_show_history_notice_);
435 } 435 }
436 436
437 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) { 437 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) {
438 // This is used by OnBrowsingDataRemoverDone (when the deletion finishes). 438 // This is used by OnBrowsingDataRemoverDone (when the deletion finishes).
439 should_show_history_deletion_dialog_ = show; 439 should_show_history_deletion_dialog_ = show;
440 } 440 }
441 441
442 } // namespace options 442 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc ('k') | chrome/browser/ui/webui/options/core_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698