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

Side by Side Diff: chrome/browser/extensions/chrome_component_extension_resource_manager.cc

Issue 2121303003: Remove the "Settings" packaged app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/extensions/chrome_component_extension_resource_manager. h" 5 #include "chrome/browser/extensions/chrome_component_extension_resource_manager. h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 18 matching lines...) Expand all
29 static const GritResourceMap kExtraComponentExtensionResources[] = { 29 static const GritResourceMap kExtraComponentExtensionResources[] = {
30 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON}, 30 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON},
31 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16}, 31 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16},
32 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, 32 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
33 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, 33 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16},
34 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
35 {"webstore_widget/app/icons/icon_16.png", IDR_WEBSTORE_ICON_16}, 35 {"webstore_widget/app/icons/icon_16.png", IDR_WEBSTORE_ICON_16},
36 {"webstore_widget/app/icons/icon_32.png", IDR_WEBSTORE_ICON_32}, 36 {"webstore_widget/app/icons/icon_32.png", IDR_WEBSTORE_ICON_32},
37 {"webstore_widget/app/icons/icon_128.png", IDR_WEBSTORE_ICON}, 37 {"webstore_widget/app/icons/icon_128.png", IDR_WEBSTORE_ICON},
38 #endif 38 #endif
39 #if defined(ENABLE_SETTINGS_APP)
40 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128},
41 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16},
42 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
43 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
44 #endif
45 }; 39 };
46 40
47 AddComponentResourceEntries( 41 AddComponentResourceEntries(
48 kComponentExtensionResources, 42 kComponentExtensionResources,
49 kComponentExtensionResourcesSize); 43 kComponentExtensionResourcesSize);
50 AddComponentResourceEntries( 44 AddComponentResourceEntries(
51 kExtraComponentExtensionResources, 45 kExtraComponentExtensionResources,
52 arraysize(kExtraComponentExtensionResources)); 46 arraysize(kExtraComponentExtensionResources));
53 #if defined(OS_CHROMEOS) 47 #if defined(OS_CHROMEOS)
54 size_t chrome_apps_resource_size; 48 size_t chrome_apps_resource_size;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 entries[i].name); 101 entries[i].name);
108 resource_path = resource_path.NormalizePathSeparators(); 102 resource_path = resource_path.NormalizePathSeparators();
109 103
110 DCHECK(path_to_resource_id_.find(resource_path) == 104 DCHECK(path_to_resource_id_.find(resource_path) ==
111 path_to_resource_id_.end()); 105 path_to_resource_id_.end());
112 path_to_resource_id_[resource_path] = entries[i].value; 106 path_to_resource_id_[resource_path] = entries[i].value;
113 } 107 }
114 } 108 }
115 109
116 } // namespace extensions 110 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698