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

Side by Side Diff: chrome/common/extensions/extension.cc

Issue 10261003: content: Move kStandardSchemeSeparator into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extension.h" 5 #include "chrome/common/extensions/extension.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/string16.h" 16 #include "base/string16.h"
17 #include "base/string_number_conversions.h" 17 #include "base/string_number_conversions.h"
18 #include "base/string_piece.h" 18 #include "base/string_piece.h"
19 #include "base/string_split.h" 19 #include "base/string_split.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/stringprintf.h" 21 #include "base/stringprintf.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "base/values.h" 23 #include "base/values.h"
24 #include "base/version.h" 24 #include "base/version.h"
25 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/chrome_version_info.h" 27 #include "chrome/common/chrome_version_info.h"
28 #include "chrome/common/extensions/csp_validator.h" 28 #include "chrome/common/extensions/csp_validator.h"
29 #include "chrome/common/extensions/extension_action.h" 29 #include "chrome/common/extensions/extension_action.h"
30 #include "chrome/common/extensions/extension_error_utils.h"
30 #include "chrome/common/extensions/extension_manifest_constants.h" 31 #include "chrome/common/extensions/extension_manifest_constants.h"
31 #include "chrome/common/extensions/extension_error_utils.h"
32 #include "chrome/common/extensions/extension_resource.h" 32 #include "chrome/common/extensions/extension_resource.h"
33 #include "chrome/common/extensions/feature.h" 33 #include "chrome/common/extensions/feature.h"
34 #include "chrome/common/extensions/file_browser_handler.h" 34 #include "chrome/common/extensions/file_browser_handler.h"
35 #include "chrome/common/extensions/manifest.h" 35 #include "chrome/common/extensions/manifest.h"
36 #include "chrome/common/extensions/simple_feature_provider.h" 36 #include "chrome/common/extensions/simple_feature_provider.h"
37 #include "chrome/common/extensions/user_script.h" 37 #include "chrome/common/extensions/user_script.h"
38 #include "chrome/common/url_constants.h" 38 #include "chrome/common/url_constants.h"
39 #include "crypto/sha2.h" 39 #include "crypto/sha2.h"
40 #include "googleurl/src/url_util.h" 40 #include "googleurl/src/url_util.h"
41 #include "grit/chromium_strings.h" 41 #include "grit/chromium_strings.h"
(...skipping 2961 matching lines...) Expand 10 before | Expand all | Expand 10 after
3003 IDR_APP_DEFAULT_ICON); 3003 IDR_APP_DEFAULT_ICON);
3004 } else { 3004 } else {
3005 return *ResourceBundle::GetSharedInstance().GetBitmapNamed( 3005 return *ResourceBundle::GetSharedInstance().GetBitmapNamed(
3006 IDR_EXTENSION_DEFAULT_ICON); 3006 IDR_EXTENSION_DEFAULT_ICON);
3007 } 3007 }
3008 } 3008 }
3009 3009
3010 // static 3010 // static
3011 GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) { 3011 GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
3012 return GURL(std::string(chrome::kExtensionScheme) + 3012 return GURL(std::string(chrome::kExtensionScheme) +
3013 chrome::kStandardSchemeSeparator + extension_id + "/"); 3013 content::kStandardSchemeSeparator + extension_id + "/");
3014 } 3014 }
3015 3015
3016 bool Extension::InitFromValue(int flags, string16* error) { 3016 bool Extension::InitFromValue(int flags, string16* error) {
3017 DCHECK(error); 3017 DCHECK(error);
3018 3018
3019 base::AutoLock auto_lock(runtime_data_lock_); 3019 base::AutoLock auto_lock(runtime_data_lock_);
3020 3020
3021 // Initialize permissions with an empty, default permission set. 3021 // Initialize permissions with an empty, default permission set.
3022 runtime_data_.SetActivePermissions(new ExtensionPermissionSet()); 3022 runtime_data_.SetActivePermissions(new ExtensionPermissionSet());
3023 optional_permission_set_ = new ExtensionPermissionSet(); 3023 optional_permission_set_ = new ExtensionPermissionSet();
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
3669 already_disabled(false), 3669 already_disabled(false),
3670 extension(extension) {} 3670 extension(extension) {}
3671 3671
3672 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( 3672 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
3673 const Extension* extension, 3673 const Extension* extension,
3674 const ExtensionPermissionSet* permissions, 3674 const ExtensionPermissionSet* permissions,
3675 Reason reason) 3675 Reason reason)
3676 : reason(reason), 3676 : reason(reason),
3677 extension(extension), 3677 extension(extension),
3678 permissions(permissions) {} 3678 permissions(permissions) {}
OLDNEW
« no previous file with comments | « chrome/common/content_settings_pattern_parser.cc ('k') | chrome/common/extensions/url_pattern.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698