chrome/browser/chromeos/screensaver/screensaver_controller.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/screensaver/screensaver_controller.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/chromeos/kiosk_mode/kiosk_mode_screensaver.cc ('k') | chrome/browser/extensions/api/developer_private/developer_private_api.cc » ('j') | chrome/browser/extensions/app_launch_manifest_parser.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/screensaver/screensaver_controller.cc

diff --git a/chrome/browser/chromeos/screensaver/screensaver_controller.cc b/chrome/browser/chromeos/screensaver/screensaver_controller.cc

index ad7daf98d78b8bedc85b041d4ef9b9d8e070ec7a..bf82da0770ba9a9457a97830116a4bc7b5fb5c2f 100644

--- a/chrome/browser/chromeos/screensaver/screensaver_controller.cc

+++ b/chrome/browser/chromeos/screensaver/screensaver_controller.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/chrome_notification_types.h"

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

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

@@ -133,7 +134,8 @@ void ScreensaverController::IdleNotify(int64 threshold) {

const extensions::Extension* screensaver_extension =

service->GetExtensionById(screensaver_extension_id_,

ExtensionService::INCLUDE_ENABLED);

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

+ ash::ShowScreensaver(

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

if (!ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))

ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);