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

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

Issue 11028121: Convert wallpaper picker to v2 app (Closed) Base URL: http://git.chromium.org/chromium/src.git@AppsV2
Patch Set: Update wallpaper picker to version .2 in manifest Created 8 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
« no previous file with comments | « chrome/common/extensions/api/_permission_features.json ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <ostream> 7 #include <ostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 2680 matching lines...) Expand 10 before | Expand all | Expand 10 after
2691 for (DictionaryValue::key_iterator iter = overrides->begin_keys(); 2691 for (DictionaryValue::key_iterator iter = overrides->begin_keys();
2692 iter != overrides->end_keys(); ++iter) { 2692 iter != overrides->end_keys(); ++iter) {
2693 std::string page = *iter; 2693 std::string page = *iter;
2694 std::string val; 2694 std::string val;
2695 // Restrict override pages to a list of supported URLs. 2695 // Restrict override pages to a list of supported URLs.
2696 bool is_override = (page != chrome::kChromeUINewTabHost && 2696 bool is_override = (page != chrome::kChromeUINewTabHost &&
2697 page != chrome::kChromeUIBookmarksHost && 2697 page != chrome::kChromeUIBookmarksHost &&
2698 page != chrome::kChromeUIHistoryHost); 2698 page != chrome::kChromeUIHistoryHost);
2699 #if defined(OS_CHROMEOS) 2699 #if defined(OS_CHROMEOS)
2700 is_override = (is_override && 2700 is_override = (is_override &&
2701 page != chrome::kChromeUIActivationMessageHost && 2701 page != chrome::kChromeUIActivationMessageHost);
2702 page != chrome::kChromeUIWallpaperHost);
2703 #endif 2702 #endif
2704 #if defined(FILE_MANAGER_EXTENSION) 2703 #if defined(FILE_MANAGER_EXTENSION)
2705 is_override = (is_override && 2704 is_override = (is_override &&
2706 !(location() == COMPONENT && 2705 !(location() == COMPONENT &&
2707 page == chrome::kChromeUIFileManagerHost)); 2706 page == chrome::kChromeUIFileManagerHost));
2708 #endif 2707 #endif
2709 2708
2710 if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) { 2709 if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
2711 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides); 2710 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
2712 return false; 2711 return false;
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
4128 4127
4129 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( 4128 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
4130 const Extension* extension, 4129 const Extension* extension,
4131 const PermissionSet* permissions, 4130 const PermissionSet* permissions,
4132 Reason reason) 4131 Reason reason)
4133 : reason(reason), 4132 : reason(reason),
4134 extension(extension), 4133 extension(extension),
4135 permissions(permissions) {} 4134 permissions(permissions) {}
4136 4135
4137 } // namespace extensions 4136 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/_permission_features.json ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698