chrome/browser/ui/webui/extensions/extensions_ui.cc - Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

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

Unified Diff: chrome/browser/ui/webui/extensions/extensions_ui.cc

Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address code review comments. 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

« chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h ('K') | « chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extensions/extensions_ui.cc

diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc

index 49d921bc7379479a0951562ede1232b5622a6272..681fd3fce4ad07907a4cd540d7a0bbd5344c9128 100644

--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc

+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc

@@ -18,6 +18,7 @@

#include "ui/base/resource/resource_bundle.h"

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

#include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h"

#endif

@@ -65,7 +66,9 @@ ExtensionsUI::ExtensionsUI(content::WebUI* web_ui) : WebUIController(web_ui) {

#if defined(OS_CHROMEOS)

chromeos::KioskAppsHandler* kiosk_app_handler =

- new chromeos::KioskAppsHandler();

+ new chromeos::KioskAppsHandler(

+ chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(

+ profile));

Nikita (slow) 2015/04/13 12:49:24 web_ui->GetWebContents()->GetBrowserContext() to a

kiosk_app_handler->GetLocalizedValues(source);

web_ui->AddMessageHandler(kiosk_app_handler);

#endif