Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: extensions/common/manifest_handlers/background_info.cc

Issue 819193002: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/common/manifest_handlers/background_info.h" 5 #include "extensions/common/manifest_handlers/background_info.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 *error = ASCIIToUTF16(errors::kBackgroundPermissionNeeded); 163 *error = ASCIIToUTF16(errors::kBackgroundPermissionNeeded);
164 return false; 164 return false;
165 } 165 }
166 // Hosted apps require an absolute URL. 166 // Hosted apps require an absolute URL.
167 if (!background_url_.is_valid()) { 167 if (!background_url_.is_valid()) {
168 *error = ASCIIToUTF16(errors::kInvalidBackgroundInHostedApp); 168 *error = ASCIIToUTF16(errors::kInvalidBackgroundInHostedApp);
169 return false; 169 return false;
170 } 170 }
171 171
172 if (!(background_url_.SchemeIs("https") || 172 if (!(background_url_.SchemeIs("https") ||
173 (CommandLine::ForCurrentProcess()->HasSwitch( 173 (base::CommandLine::ForCurrentProcess()->HasSwitch(
174 switches::kAllowHTTPBackgroundPage) && 174 switches::kAllowHTTPBackgroundPage) &&
175 background_url_.SchemeIs("http")))) { 175 background_url_.SchemeIs("http")))) {
176 *error = ASCIIToUTF16(errors::kInvalidBackgroundInHostedApp); 176 *error = ASCIIToUTF16(errors::kInvalidBackgroundInHostedApp);
177 return false; 177 return false;
178 } 178 }
179 } else { 179 } else {
180 background_url_ = extension->GetResourceURL(background_str); 180 background_url_ = extension->GetResourceURL(background_str);
181 } 181 }
182 182
183 return true; 183 return true;
184 } 184 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 const std::vector<std::string> BackgroundManifestHandler::Keys() const { 310 const std::vector<std::string> BackgroundManifestHandler::Keys() const {
311 static const char* keys[] = { 311 static const char* keys[] = {
312 keys::kBackgroundAllowJsAccess, keys::kBackgroundPage, 312 keys::kBackgroundAllowJsAccess, keys::kBackgroundPage,
313 keys::kBackgroundPageLegacy, keys::kBackgroundPersistent, 313 keys::kBackgroundPageLegacy, keys::kBackgroundPersistent,
314 keys::kBackgroundScripts, keys::kPlatformAppBackgroundPage, 314 keys::kBackgroundScripts, keys::kPlatformAppBackgroundPage,
315 keys::kPlatformAppBackgroundScripts}; 315 keys::kPlatformAppBackgroundScripts};
316 return std::vector<std::string>(keys, keys + arraysize(keys)); 316 return std::vector<std::string>(keys, keys + arraysize(keys));
317 } 317 }
318 318
319 } // namespace extensions 319 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/features/simple_feature.cc ('k') | extensions/common/manifest_handlers/permissions_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698