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

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

Issue 2392693002: Rewrite simple uses of base::ListValue::Append(base::Value*) on CrOS. (Closed)
Patch Set: MakeUnique Created 4 years, 2 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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 values->SetString("contentProtectionAttestationLearnMoreURL", 633 values->SetString("contentProtectionAttestationLearnMoreURL",
634 chrome::kAttestationForContentProtectionLearnMoreURL); 634 chrome::kAttestationForContentProtectionLearnMoreURL);
635 635
636 // Creates magnifierList. 636 // Creates magnifierList.
637 std::unique_ptr<base::ListValue> magnifier_list(new base::ListValue); 637 std::unique_ptr<base::ListValue> magnifier_list(new base::ListValue);
638 638
639 std::unique_ptr<base::ListValue> option_full(new base::ListValue); 639 std::unique_ptr<base::ListValue> option_full(new base::ListValue);
640 option_full->AppendInteger(ash::MAGNIFIER_FULL); 640 option_full->AppendInteger(ash::MAGNIFIER_FULL);
641 option_full->AppendString(l10n_util::GetStringUTF16( 641 option_full->AppendString(l10n_util::GetStringUTF16(
642 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL)); 642 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));
643 magnifier_list->Append(option_full.release()); 643 magnifier_list->Append(std::move(option_full));
644 644
645 std::unique_ptr<base::ListValue> option_partial(new base::ListValue); 645 std::unique_ptr<base::ListValue> option_partial(new base::ListValue);
646 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); 646 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
647 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( 647 option_partial->AppendString(l10n_util::GetStringUTF16(
648 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); 648 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL));
649 magnifier_list->Append(option_partial.release()); 649 magnifier_list->Append(std::move(option_partial));
650 650
651 values->Set("magnifierList", magnifier_list.release()); 651 values->Set("magnifierList", magnifier_list.release());
652 #endif 652 #endif
653 653
654 #if defined(OS_MACOSX) 654 #if defined(OS_MACOSX)
655 values->SetString("macPasswordsWarning", 655 values->SetString("macPasswordsWarning",
656 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); 656 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
657 values->SetBoolean("multiple_profiles", 657 values->SetBoolean("multiple_profiles",
658 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1); 658 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
659 #endif 659 #endif
(...skipping 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after
2234 2234
2235 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2235 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2236 #if defined(OS_CHROMEOS) 2236 #if defined(OS_CHROMEOS)
2237 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2237 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2238 #else 2238 #else
2239 return true; 2239 return true;
2240 #endif 2240 #endif
2241 } 2241 }
2242 2242
2243 } // namespace options 2243 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698