chrome/browser/chromeos/app_mode/startup_app_launcher.cc - Issue 481433005: Extensions: Move id_util functions to crx_file component.

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 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 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:

Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

index 5e7d1bf41cc6aa84df3655e77bbf58ca272c88f5..8dfd0dda5e94dc636e46b9df434569f474383046 100644

--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

@@ -27,6 +27,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

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

+#include "components/crx_file/id_util.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

#include "components/user_manager/user_manager.h"

@@ -76,7 +77,7 @@ StartupAppLauncher::StartupAppLauncher(Profile* profile,

ready_to_launch_(false),

wait_for_crx_update_(false) {

DCHECK(profile_);

- DCHECK(Extension::IdIsValid(app_id_));

+ DCHECK(crx_file::id_util::IdIsValid(app_id_));

KioskAppManager::Get()->AddObserver(this);

}