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

Unified Diff: chrome/browser/ui/webui/flags_ui.cc

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed the comments from Denis. Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/flags_ui.cc
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index acdd1aa2597d97a9c914e4d8b5fa21d0628e54f6..d24be11bb49436606f5f2822cee1507ca1789fba 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -29,7 +29,7 @@
#include "ui/base/resource/resource_bundle.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/user_cros_settings_provider.h"
+#include "chrome/browser/chromeos/cros_settings.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#endif
@@ -58,8 +58,9 @@ ChromeWebUIDataSource* CreateFlagsUIHTMLSource() {
#if defined(OS_CHROMEOS)
// Set the strings to show which user can actually change the flags
source->AddLocalizedString("ownerOnly", IDS_OPTIONS_ACCOUNTS_OWNER_ONLY);
- source->AddString("ownerUserId", UTF8ToUTF16(
- chromeos::UserCrosSettingsProvider::cached_owner()));
+ std::string owner;
+ chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+ source->AddString("ownerUserId", UTF8ToUTF16(owner));
#endif
source->set_json_path("strings.js");

Powered by Google App Engine
This is Rietveld 408576698