| OLD | NEW |
| 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 #if !defined(OS_CHROMEOS) | 177 #if !defined(OS_CHROMEOS) |
| 178 bool IsDisabledByPolicy(const BooleanPrefMember& pref) { | 178 bool IsDisabledByPolicy(const BooleanPrefMember& pref) { |
| 179 return pref.IsManaged() && !pref.GetValue(); | 179 return pref.IsManaged() && !pref.GetValue(); |
| 180 } | 180 } |
| 181 #endif // !defined(OS_CHROMEOS) | 181 #endif // !defined(OS_CHROMEOS) |
| 182 | 182 |
| 183 std::string GetSyncErrorAction(sync_ui_util::ActionType action_type) { | 183 std::string GetSyncErrorAction(sync_ui_util::ActionType action_type) { |
| 184 switch (action_type) { | 184 switch (action_type) { |
| 185 case sync_ui_util::REAUTHENTICATE: | 185 case sync_ui_util::REAUTHENTICATE: |
| 186 return "reauthenticate"; | 186 return "reauthenticate"; |
| 187 case sync_ui_util::SIGNOUT_AND_SIGNIN: |
| 188 return "signOutAndSignIn"; |
| 187 case sync_ui_util::UPGRADE_CLIENT: | 189 case sync_ui_util::UPGRADE_CLIENT: |
| 188 return "upgradeClient"; | 190 return "upgradeClient"; |
| 189 case sync_ui_util::ENTER_PASSPHRASE: | 191 case sync_ui_util::ENTER_PASSPHRASE: |
| 190 return "enterPassphrase"; | 192 return "enterPassphrase"; |
| 191 default: | 193 default: |
| 192 return "noAction"; | 194 return "noAction"; |
| 193 } | 195 } |
| 194 } | 196 } |
| 195 | 197 |
| 196 } // namespace | 198 } // namespace |
| (...skipping 2100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2297 | 2299 |
| 2298 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { | 2300 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { |
| 2299 #if defined(OS_CHROMEOS) | 2301 #if defined(OS_CHROMEOS) |
| 2300 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); | 2302 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); |
| 2301 #else | 2303 #else |
| 2302 return true; | 2304 return true; |
| 2303 #endif | 2305 #endif |
| 2304 } | 2306 } |
| 2305 | 2307 |
| 2306 } // namespace options | 2308 } // namespace options |
| OLD | NEW |