chrome/browser/supervised_user/supervised_user_whitelist_service.h - Issue 1443033004: Supervised User whitelists: update to json format v2

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/supervised_user/supervised_user_whitelist_service.h

Issue 1443033004: Supervised User whitelists: update to json format v2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove l10n Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc ('k') | chrome/browser/supervised_user/supervised_user_whitelist_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_whitelist_service.h

diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.h b/chrome/browser/supervised_user/supervised_user_whitelist_service.h

index cf80bfb1904df6c774c74a7810d2c09788c5bc4d..a1f57e0e3aae65cae16e9431e0d84b618a84b7a1 100644

--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.h

+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.h

@@ -12,6 +12,7 @@

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

+#include "base/strings/string16.h"

#include "base/time/time.h"

#include "chrome/browser/supervised_user/supervised_users.h"

#include "sync/api/syncable_service.h"

@@ -64,6 +65,7 @@ class SupervisedUserWhitelistService : public syncer::SyncableService {

// Loads an already existing whitelist on disk (i.e. without downloading it as

// a component).

void LoadWhitelistForTesting(const std::string& id,

+ const base::string16& title,

const base::FilePath& path);

// Unloads a whitelist. Public for testing.

@@ -112,6 +114,7 @@ class SupervisedUserWhitelistService : public syncer::SyncableService {

void NotifyWhitelistsChanged();

void OnWhitelistReady(const std::string& id,

+ const base::string16& title,

const base::FilePath& whitelist_path);

void OnWhitelistLoaded(

const std::string& id,