diff options
author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 17:43:37 +0000 |
---|---|---|
committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 17:43:37 +0000 |
commit | 3a7fbc24640bd709fae9fa30ed624ec65487299b (patch) | |
tree | 8fc3a2d407bb79302e18280d03f9720ad7b0d387 /extensions/common/url_pattern.cc | |
parent | c6c02068f3d5c28f5efd0c21cc979c10ae71bddd (diff) | |
download | chromium_src-3a7fbc24640bd709fae9fa30ed624ec65487299b.zip chromium_src-3a7fbc24640bd709fae9fa30ed624ec65487299b.tar.gz chromium_src-3a7fbc24640bd709fae9fa30ed624ec65487299b.tar.bz2 |
Create simplified ExtensionSystem for app_shell
* Only initialize a few core ExtensionSystem services
* Switch to using extension_file_util::LoadExtension instead of AppLoadService,
which allows us to avoid ExtensionService for now.
* Clean up RootWindow creation and handle clicks on the close box.
This allows app_shell to parse a non-app extension and create an Extension
object. The Extension does not yet start running.
BUG=288226
TEST=none
R=derat@chromium.org, yoz@chromium.org
Review URL: https://codereview.chromium.org/116573011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/url_pattern.cc')
-rw-r--r-- | extensions/common/url_pattern.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc index 5326f43..dc097dc 100644 --- a/extensions/common/url_pattern.cc +++ b/extensions/common/url_pattern.cc @@ -128,8 +128,9 @@ URLPattern::URLPattern(int valid_schemes, const std::string& pattern) match_all_urls_(false), match_subdomains_(false), port_("*") { - if (PARSE_SUCCESS != Parse(pattern)) - NOTREACHED() << "URLPattern is invalid: " << pattern; + ParseResult result = Parse(pattern); + if (PARSE_SUCCESS != result) + NOTREACHED() << "URLPattern invalid: " << pattern << " result " << result; } URLPattern::~URLPattern() { |