diff options
| author | avi <avi@chromium.org> | 2014-12-22 15:49:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 23:50:37 +0000 |
| commit | 9ab037205876578d14c5686f491c37bab680eccb (patch) | |
| tree | 0ab316d7023d4e6bc6243734f5407ac01a8a8f06 /extensions/common/manifest_handlers | |
| parent | fdb146cf261d909613a1d1b11e70d0ba96280ffe (diff) | |
| download | chromium_src-9ab037205876578d14c5686f491c37bab680eccb.zip chromium_src-9ab037205876578d14c5686f491c37bab680eccb.tar.gz chromium_src-9ab037205876578d14c5686f491c37bab680eccb.tar.bz2 | |
Make callers of CommandLine use it via the base:: namespace.
Covers courgette/, dbus/, device/, extensions/, gin/, google_apis/, and gpu/.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/819193002
Cr-Commit-Position: refs/heads/master@{#309490}
Diffstat (limited to 'extensions/common/manifest_handlers')
| -rw-r--r-- | extensions/common/manifest_handlers/background_info.cc | 4 | ||||
| -rw-r--r-- | extensions/common/manifest_handlers/permissions_parser.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc index 230eba1..3d57568 100644 --- a/extensions/common/manifest_handlers/background_info.cc +++ b/extensions/common/manifest_handlers/background_info.cc @@ -170,8 +170,8 @@ bool BackgroundInfo::LoadBackgroundPage(const Extension* extension, } if (!(background_url_.SchemeIs("https") || - (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAllowHTTPBackgroundPage) && + (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAllowHTTPBackgroundPage) && background_url_.SchemeIs("http")))) { *error = ASCIIToUTF16(errors::kInvalidBackgroundInHostedApp); return false; diff --git a/extensions/common/manifest_handlers/permissions_parser.cc b/extensions/common/manifest_handlers/permissions_parser.cc index 42d5c61..f8ef11c 100644 --- a/extensions/common/manifest_handlers/permissions_parser.cc +++ b/extensions/common/manifest_handlers/permissions_parser.cc @@ -63,7 +63,7 @@ bool CanSpecifyHostPermission(const Extension* extension, if (PermissionsData::CanExecuteScriptEverywhere(extension)) return true; - if (CommandLine::ForCurrentProcess()->HasSwitch( + if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kExtensionsOnChromeURLs)) { return true; } |