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

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

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y
Patch Set: fix chromevox code generated from js Created 4 years, 6 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 values->SetString("accessibilitySettingsURL", 631 values->SetString("accessibilitySettingsURL",
632 settings_url); 632 settings_url);
633 633
634 values->SetString("contentProtectionAttestationLearnMoreURL", 634 values->SetString("contentProtectionAttestationLearnMoreURL",
635 chrome::kAttestationForContentProtectionLearnMoreURL); 635 chrome::kAttestationForContentProtectionLearnMoreURL);
636 636
637 // Creates magnifierList. 637 // Creates magnifierList.
638 std::unique_ptr<base::ListValue> magnifier_list(new base::ListValue); 638 std::unique_ptr<base::ListValue> magnifier_list(new base::ListValue);
639 639
640 std::unique_ptr<base::ListValue> option_full(new base::ListValue); 640 std::unique_ptr<base::ListValue> option_full(new base::ListValue);
641 option_full->AppendInteger(ui::MAGNIFIER_FULL); 641 option_full->AppendInteger(ash::MAGNIFIER_FULL);
642 option_full->AppendString(l10n_util::GetStringUTF16( 642 option_full->AppendString(l10n_util::GetStringUTF16(
643 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL)); 643 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));
644 magnifier_list->Append(option_full.release()); 644 magnifier_list->Append(option_full.release());
645 645
646 std::unique_ptr<base::ListValue> option_partial(new base::ListValue); 646 std::unique_ptr<base::ListValue> option_partial(new base::ListValue);
647 option_partial->AppendInteger(ui::MAGNIFIER_PARTIAL); 647 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
648 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( 648 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
649 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); 649 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));
650 magnifier_list->Append(option_partial.release()); 650 magnifier_list->Append(option_partial.release());
651 651
652 values->Set("magnifierList", magnifier_list.release()); 652 values->Set("magnifierList", magnifier_list.release());
653 #endif 653 #endif
654 654
655 #if defined(OS_MACOSX) 655 #if defined(OS_MACOSX)
656 values->SetString("macPasswordsWarning", 656 values->SetString("macPasswordsWarning",
657 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); 657 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 2228
2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2230 #if defined(OS_CHROMEOS) 2230 #if defined(OS_CHROMEOS)
2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2232 #else 2232 #else
2233 return true; 2233 return true;
2234 #endif 2234 #endif
2235 } 2235 }
2236 2236
2237 } // namespace options 2237 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698