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

Side by Side Diff: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest master Created 6 years, 6 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" 5 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "content/public/common/url_constants.h" 14 #include "content/public/common/url_constants.h"
15 #include "extensions/common/error_utils.h" 15 #include "extensions/common/error_utils.h"
16 #include "extensions/common/extension.h" 16 #include "extensions/common/extension.h"
17 #include "extensions/common/extension_resource.h" 17 #include "extensions/common/extension_resource.h"
18 #include "extensions/common/manifest_constants.h" 18 #include "extensions/common/manifest_constants.h"
19 #include "extensions/common/manifest_handlers/permissions_parser.h"
19 #include "extensions/common/permissions/permissions_data.h" 20 #include "extensions/common/permissions/permissions_data.h"
20 #include "extensions/common/url_pattern.h" 21 #include "extensions/common/url_pattern.h"
21 #include "extensions/common/url_pattern_set.h" 22 #include "extensions/common/url_pattern_set.h"
22 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
24 #include "url/gurl.h" 25 #include "url/gurl.h"
25 26
26 namespace extensions { 27 namespace extensions {
27 28
28 namespace keys = extensions::manifest_keys; 29 namespace keys = extensions::manifest_keys;
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 if (extension->converted_from_user_script()) { 426 if (extension->converted_from_user_script()) {
426 user_script.set_emulate_greasemonkey(true); 427 user_script.set_emulate_greasemonkey(true);
427 // Greasemonkey matches all frames. 428 // Greasemonkey matches all frames.
428 user_script.set_match_all_frames(true); 429 user_script.set_match_all_frames(true);
429 } 430 }
430 user_script.set_id(g_next_user_script_id++); 431 user_script.set_id(g_next_user_script_id++);
431 content_scripts_info->content_scripts.push_back(user_script); 432 content_scripts_info->content_scripts.push_back(user_script);
432 } 433 }
433 extension->SetManifestData(keys::kContentScripts, 434 extension->SetManifestData(keys::kContentScripts,
434 content_scripts_info.release()); 435 content_scripts_info.release());
435 PermissionsData::SetInitialScriptableHosts( 436 PermissionsParser::SetScriptableHosts(
436 extension, 437 extension, ContentScriptsInfo::GetScriptableHosts(extension));
437 ContentScriptsInfo::GetScriptableHosts(extension));
438 return true; 438 return true;
439 } 439 }
440 440
441 bool ContentScriptsHandler::Validate( 441 bool ContentScriptsHandler::Validate(
442 const Extension* extension, 442 const Extension* extension,
443 std::string* error, 443 std::string* error,
444 std::vector<InstallWarning>* warnings) const { 444 std::vector<InstallWarning>* warnings) const {
445 // Validate that claimed script resources actually exist, 445 // Validate that claimed script resources actually exist,
446 // and are UTF-8 encoded. 446 // and are UTF-8 encoded.
447 ExtensionResource::SymlinkPolicy symlink_policy; 447 ExtensionResource::SymlinkPolicy symlink_policy;
(...skipping 27 matching lines...) Expand all
475 if (!IsScriptValid(path, css_script.relative_path(), 475 if (!IsScriptValid(path, css_script.relative_path(),
476 IDS_EXTENSION_LOAD_CSS_FAILED, error)) 476 IDS_EXTENSION_LOAD_CSS_FAILED, error))
477 return false; 477 return false;
478 } 478 }
479 } 479 }
480 480
481 return true; 481 return true;
482 } 482 }
483 483
484 } // namespace extensions 484 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698