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

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

Issue 1103943003: Add components/chrome_apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chrome/browser/extensions/DEPS ('k') | chrome/chrome_browser_extensions.gypi » ('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 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/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/common/chrome_paths.h" 9 #include "chrome/common/chrome_paths.h"
10 #include "grit/chrome_unscaled_resources.h" 10 #include "grit/chrome_unscaled_resources.h"
11 #include "grit/component_extension_resources_map.h" 11 #include "grit/component_extension_resources_map.h"
12 #include "grit/theme_resources.h" 12 #include "grit/theme_resources.h"
13 13
14 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
15 #include "components/chrome_apps/chrome_apps_resource_util.h"
15 #include "ui/file_manager/file_manager_resource_util.h" 16 #include "ui/file_manager/file_manager_resource_util.h"
16 #endif 17 #endif
17 18
18 #if defined(USE_AURA) 19 #if defined(USE_AURA)
19 #include "ui/keyboard/keyboard_util.h" 20 #include "ui/keyboard/keyboard_util.h"
20 #endif 21 #endif
21 22
22 namespace extensions { 23 namespace extensions {
23 24
24 ChromeComponentExtensionResourceManager:: 25 ChromeComponentExtensionResourceManager::
(...skipping 11 matching lines...) Expand all
36 #endif 37 #endif
37 }; 38 };
38 39
39 AddComponentResourceEntries( 40 AddComponentResourceEntries(
40 kComponentExtensionResources, 41 kComponentExtensionResources,
41 kComponentExtensionResourcesSize); 42 kComponentExtensionResourcesSize);
42 AddComponentResourceEntries( 43 AddComponentResourceEntries(
43 kExtraComponentExtensionResources, 44 kExtraComponentExtensionResources,
44 arraysize(kExtraComponentExtensionResources)); 45 arraysize(kExtraComponentExtensionResources));
45 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
47 size_t chrome_apps_resource_size;
48 const GritResourceMap* chrome_apps_resources =
49 chrome_apps::GetChromeAppsResources(&chrome_apps_resource_size);
50 AddComponentResourceEntries(
51 chrome_apps_resources,
52 chrome_apps_resource_size);
53
46 size_t file_manager_resource_size; 54 size_t file_manager_resource_size;
47 const GritResourceMap* file_manager_resources = 55 const GritResourceMap* file_manager_resources =
48 file_manager::GetFileManagerResources(&file_manager_resource_size); 56 file_manager::GetFileManagerResources(&file_manager_resource_size);
49 AddComponentResourceEntries( 57 AddComponentResourceEntries(
50 file_manager_resources, 58 file_manager_resources,
51 file_manager_resource_size); 59 file_manager_resource_size);
52 60
53 size_t keyboard_resource_size; 61 size_t keyboard_resource_size;
54 const GritResourceMap* keyboard_resources = 62 const GritResourceMap* keyboard_resources =
55 keyboard::GetKeyboardExtensionResources(&keyboard_resource_size); 63 keyboard::GetKeyboardExtensionResources(&keyboard_resource_size);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 entries[i].name); 100 entries[i].name);
93 resource_path = resource_path.NormalizePathSeparators(); 101 resource_path = resource_path.NormalizePathSeparators();
94 102
95 DCHECK(path_to_resource_id_.find(resource_path) == 103 DCHECK(path_to_resource_id_.find(resource_path) ==
96 path_to_resource_id_.end()); 104 path_to_resource_id_.end());
97 path_to_resource_id_[resource_path] = entries[i].value; 105 path_to_resource_id_[resource_path] = entries[i].value;
98 } 106 }
99 } 107 }
100 108
101 } // namespace extensions 109 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/DEPS ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698