chrome/browser/chromeos/app_mode/startup_app_launcher.cc - Issue 26227005: Merge 225400 "Add "kiosk_only" manifest attribute for platform a..."

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/app_mode/startup_app_launcher.cc

Issue 26227005: Merge 225400 "Add "kiosk_only" manifest attribute for platform a..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1650/src/

Patch Set: Created 7 years, 2 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/chromeos/app_mode/startup_app_launcher.cc

===================================================================

--- chrome/browser/chromeos/app_mode/startup_app_launcher.cc (revision 227631)

+++ chrome/browser/chromeos/app_mode/startup_app_launcher.cc (working copy)

@@ -26,7 +26,7 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

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

-#include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h"

+#include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h"

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

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

#include "google_apis/gaia/gaia_auth_consumer.h"

@@ -222,7 +222,7 @@

extension_service()->GetInstalledExtension(app_id_);

CHECK(extension);

- if (!extensions::KioskEnabledInfo::IsKioskEnabled(extension)) {

+ if (!extensions::KioskModeInfo::IsKioskEnabled(extension)) {

OnLaunchFailure(KioskAppLaunchError::NOT_KIOSK_ENABLED);

return;

}

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/fake_user_manager.h » ('j') | no next file with comments »