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

Unified Diff: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h

Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify a bit. Created 5 years, 8 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/ui/webui/extensions/chromeos/kiosk_apps_handler.h
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
index 23df3a1450304eef77346f168f71b39138334e39..2147ddc8a2687a14bcbe21d8da8299906b665882 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
@@ -13,6 +13,8 @@
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
#include "content/public/browser/web_ui_message_handler.h"
+class Profile;
+
namespace base {
class DictionaryValue;
class ListValue;
@@ -25,11 +27,12 @@ class WebUIDataSource;
namespace chromeos {
class KioskAppManager;
+class OwnerSettingsServiceChromeOS;
class KioskAppsHandler : public content::WebUIMessageHandler,
public KioskAppManagerObserver {
public:
- KioskAppsHandler();
+ explicit KioskAppsHandler(Profile* profile);
Mattias Nissler (ping if slow) 2015/04/07 12:59:18 Might as well just pass OwnerSettingsService* here
~KioskAppsHandler() override;
void GetLocalizedValues(content::WebUIDataSource* source);
@@ -69,6 +72,7 @@ class KioskAppsHandler : public content::WebUIMessageHandler,
bool initialized_;
bool is_kiosk_enabled_;
bool is_auto_launch_enabled_;
+ OwnerSettingsServiceChromeOS* owner_settings_service_;
base::WeakPtrFactory<KioskAppsHandler> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(KioskAppsHandler);

Powered by Google App Engine
This is Rietveld 408576698