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

Unified Diff: chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

Issue 10445043: browser: Handle the registration of ChromeLauncher prefs outside of views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/policy/configuration_policy_handler_chromeos_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
index 51e8f1a2d3ec6d889133ecf6799dc2c4994ea456..b72b7d97948391bddf98370037252f5ffd552a40 100644
--- a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/policy/policy_error_map.h"
#include "chrome/browser/policy/policy_map.h"
#include "chrome/browser/prefs/pref_value_map.h"
-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
+#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/common/pref_names.h"
#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -128,8 +128,7 @@ TEST(PinnedLauncherAppsPolicyHandler, PrefTranslation) {
base::StringValue entry1("abcdefghijklmnopabcdefghijklmnop");
base::DictionaryValue* entry1_dict = new base::DictionaryValue();
- entry1_dict->Set(ChromeLauncherController::kPinnedAppsPrefAppIDPath,
- entry1.DeepCopy());
+ entry1_dict->Set(ash::kPinnedAppsPrefAppIDPath, entry1.DeepCopy());
expected_pinned_apps.Append(entry1_dict);
list.Append(entry1.DeepCopy());
policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY,
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_chromeos.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698