chrome/browser/web_applications/web_app_mac.mm - 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/web_applications/web_app_mac.mm

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/web_applications/web_app_mac.mm

diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm

index a0a3ba05aaf106c7daeaa77556482ed75e995b8c..a49e357e5f570ecb640aaf22b0696759a8716588 100644

--- a/chrome/browser/web_applications/web_app_mac.mm

+++ b/chrome/browser/web_applications/web_app_mac.mm

@@ -38,6 +38,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#import "chrome/common/mac/app_mode_common.h"

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

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

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

@@ -447,7 +448,7 @@ bool IsShimForProfile(const base::FilePath& base_name,

std::string app_id = base_name.RemoveExtension().value();

// Strip (profile_base_name + " ") from the start.

app_id = app_id.substr(profile_base_name.size() + 1);

- return extensions::Extension::IdIsValid(app_id);

+ return crx_file::id_util::IdIsValid(app_id);

}

std::vector<base::FilePath> GetAllAppBundlesInPath(