chrome/browser/ui/webui/flags_ui.cc - Issue 7867044: PART1: Initiated the SignedSettings refactoring.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Final rebase to ToT before hitting the CQ. Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 cfea2851f3da1729bf70900ad52c70ffaf921a42..3fb845c30164335a6f99aeab2fb110d92a06a76b 100644

--- a/chrome/browser/ui/webui/flags_ui.cc

+++ b/chrome/browser/ui/webui/flags_ui.cc

@@ -28,7 +28,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

@@ -57,8 +57,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");