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

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: Created 8 years, 1 month 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 (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 2646 matching lines...) Expand 10 before | Expand all | Expand 10 after
2657 for (DictionaryValue::key_iterator iter = overrides->begin_keys(); 2657 for (DictionaryValue::key_iterator iter = overrides->begin_keys();
2658 iter != overrides->end_keys(); ++iter) { 2658 iter != overrides->end_keys(); ++iter) {
2659 std::string page = *iter; 2659 std::string page = *iter;
2660 std::string val; 2660 std::string val;
2661 // Restrict override pages to a list of supported URLs. 2661 // Restrict override pages to a list of supported URLs.
2662 bool is_override = (page != chrome::kChromeUINewTabHost && 2662 bool is_override = (page != chrome::kChromeUINewTabHost &&
2663 page != chrome::kChromeUIBookmarksHost && 2663 page != chrome::kChromeUIBookmarksHost &&
2664 page != chrome::kChromeUIHistoryHost); 2664 page != chrome::kChromeUIHistoryHost);
2665 #if defined(OS_CHROMEOS) 2665 #if defined(OS_CHROMEOS)
2666 is_override = (is_override && 2666 is_override = (is_override &&
2667 page != chrome::kChromeUIActivationMessageHost && 2667 page != chrome::kChromeUIActivationMessageHost);
2668 page != chrome::kChromeUIWallpaperHost);
2669 #endif 2668 #endif
2670 #if defined(FILE_MANAGER_EXTENSION) 2669 #if defined(FILE_MANAGER_EXTENSION)
2671 is_override = (is_override && 2670 is_override = (is_override &&
2672 !(location() == COMPONENT && 2671 !(location() == COMPONENT &&
2673 page == chrome::kChromeUIFileManagerHost)); 2672 page == chrome::kChromeUIFileManagerHost));
2674 #endif 2673 #endif
2675 2674
2676 if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) { 2675 if (is_override || !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
2677 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides); 2676 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
2678 return false; 2677 return false;
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after
4093 4092
4094 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( 4093 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
4095 const Extension* extension, 4094 const Extension* extension,
4096 const PermissionSet* permissions, 4095 const PermissionSet* permissions,
4097 Reason reason) 4096 Reason reason)
4098 : reason(reason), 4097 : reason(reason),
4099 extension(extension), 4098 extension(extension),
4100 permissions(permissions) {} 4099 permissions(permissions) {}
4101 4100
4102 } // namespace extensions 4101 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698