chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc - Issue 12316077: Move the parsing of app.launch related keys out of Extension class.

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/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 12316077: Move the parsing of app.launch related keys out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase + review comments addressed Created 7 years, 10 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/autocomplete/extension_app_provider.cc ('k') | chrome/browser/chromeos/screensaver/screensaver_controller.cc » ('j') | chrome/browser/extensions/app_launch_manifest_parser.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

index d07bab92d53e5b49902a11a1475d521e5c03b52f..357a525573118cdad312a244a9f5e0965015ee29 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

@@ -23,6 +23,7 @@

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/extensions/app_launcher_info.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_file_util.h"

#include "content/public/browser/browser_thread.h"

@@ -222,7 +223,8 @@ void KioskModeScreensaver::SetupScreensaver(

if (default_profile) {

extensions::ExtensionSystem::Get(default_profile)->extension_service()->

AddExtension(extension);

- ash::ShowScreensaver(extension->GetFullLaunchURL());

+ ash::ShowScreensaver(

+ extensions::AppLauncherInfo::GetFullLaunchURL(extension));

} else {

LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!";

ShutdownKioskModeScreensaver();