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

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

Issue 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, fix gypi problem Created 8 years, 2 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
OLDNEW
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/configuration_policy_handler_chromeos.h" 5 #include "chrome/browser/policy/configuration_policy_handler_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/pref_value_map.h"
12 #include "base/string_util.h" 13 #include "base/string_util.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "chrome/browser/chromeos/cros/onc_constants.h" 15 #include "chrome/browser/chromeos/cros/onc_constants.h"
15 #include "chrome/browser/chromeos/cros/onc_network_parser.h" 16 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
16 #include "chrome/browser/policy/policy_error_map.h" 17 #include "chrome/browser/policy/policy_error_map.h"
17 #include "chrome/browser/policy/policy_map.h" 18 #include "chrome/browser/policy/policy_map.h"
18 #include "chrome/browser/prefs/pref_value_map.h"
19 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 19 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
20 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "policy/policy_constants.h" 22 #include "policy/policy_constants.h"
23 23
24 namespace onc = chromeos::onc; 24 namespace onc = chromeos::onc;
25 25
26 namespace policy { 26 namespace policy {
27 27
28 NetworkConfigurationPolicyHandler::NetworkConfigurationPolicyHandler( 28 NetworkConfigurationPolicyHandler::NetworkConfigurationPolicyHandler(
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 base::DictionaryValue* app_dict = new base::DictionaryValue(); 170 base::DictionaryValue* app_dict = new base::DictionaryValue();
171 app_dict->SetString(ash::kPinnedAppsPrefAppIDPath, id); 171 app_dict->SetString(ash::kPinnedAppsPrefAppIDPath, id);
172 pinned_apps_list->Append(app_dict); 172 pinned_apps_list->Append(app_dict);
173 } 173 }
174 } 174 }
175 prefs->SetValue(pref_path(), pinned_apps_list); 175 prefs->SetValue(pref_path(), pinned_apps_list);
176 } 176 }
177 } 177 }
178 178
179 } // namespace policy 179 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698