chrome/browser/policy/managed_mode_policy_provider.cc - Issue 17390010: Use a direct include of strings headers, delete some strings forwarding headers.

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/policy/managed_mode_policy_provider.cc

Issue 17390010: Use a direct include of strings headers, delete some strings forwarding headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: one less deleted file Created 7 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 | Annotate | Revision Log

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/policy/managed_mode_policy_provider.h"	5 #include "chrome/browser/policy/managed_mode_policy_provider.h"

6	6

7 #include "base/json/json_reader.h"	7 #include "base/json/json_reader.h"

8 #include "base/json/json_writer.h"	8 #include "base/json/json_writer.h"

9 #include "base/prefs/json_pref_store.h"	9 #include "base/prefs/json_pref_store.h"

10 #include "base/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/threading/sequenced_worker_pool.h"	11 #include "base/threading/sequenced_worker_pool.h"

12 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"	12 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"

13 #include "chrome/browser/policy/policy_bundle.h"	13 #include "chrome/browser/policy/policy_bundle.h"

14 #include "chrome/browser/prefs/incognito_mode_prefs.h"	14 #include "chrome/browser/prefs/incognito_mode_prefs.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/common/chrome_constants.h"	16 #include "chrome/common/chrome_constants.h"

17 #include "content/public/browser/browser_thread.h"	17 #include "content/public/browser/browser_thread.h"

18 #include "content/public/browser/user_metrics.h"	18 #include "content/public/browser/user_metrics.h"

19 #include "policy/policy_constants.h"	19 #include "policy/policy_constants.h"

20 #include "sync/api/sync_change.h"	20 #include "sync/api/sync_change.h"

(...skipping 352 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
373 if (!SettingShouldApplyToPolicy(it.key()))	373 if (!SettingShouldApplyToPolicy(it.key()))

374 continue;	374 continue;

375	375

376 policy_map->Set(it.key(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,	376 policy_map->Set(it.key(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

377 it.value().DeepCopy());	377 it.value().DeepCopy());

378 }	378 }

379 UpdatePolicy(policy_bundle.Pass());	379 UpdatePolicy(policy_bundle.Pass());

380 }	380 }

381	381

382 } // namespace policy	382 } // namespace policy

OLD	NEW