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

Unified Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_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
« no previous file with comments | « chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
index deb821cb3de4f267f7cd0f035d2d50e0ccd092bd..d115d1ab099e35ae0b3a2ce1f93a1b482c034a2e 100644
--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -10,6 +10,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/pref_names.h"
@@ -98,12 +99,10 @@ TEST_F(ChromeLauncherControllerTest, Policy) {
base::ListValue policy_value;
base::DictionaryValue* entry1 = new DictionaryValue();
- entry1->SetString(ChromeLauncherController::kPinnedAppsPrefAppIDPath,
- extension1_->id());
+ entry1->SetString(ash::kPinnedAppsPrefAppIDPath, extension1_->id());
policy_value.Append(entry1);
base::DictionaryValue* entry2 = new DictionaryValue();
- entry2->SetString(ChromeLauncherController::kPinnedAppsPrefAppIDPath,
- extension2_->id());
+ entry2->SetString(ash::kPinnedAppsPrefAppIDPath, extension2_->id());
policy_value.Append(entry2);
profile_.GetTestingPrefService()->SetManagedPref(prefs::kPinnedLauncherApps,
policy_value.DeepCopy());
« no previous file with comments | « chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698