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

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

Issue 1392713002: Extract content dependency from keyboard code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 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/BUILD.gn ('k') | chrome/browser/ui/BUILD.gn » ('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 "components/chrome_apps/chrome_apps_resource_util.h"
16 #include "ui/file_manager/file_manager_resource_util.h" 16 #include "ui/file_manager/file_manager_resource_util.h"
17 #endif 17 #endif
18 18
19 #if defined(USE_AURA) 19 #if defined(USE_AURA)
20 #include "ui/keyboard/keyboard_util.h" 20 #include "ui/keyboard/content/keyboard_content_util.h"
21 #endif 21 #endif
22 22
23 namespace extensions { 23 namespace extensions {
24 24
25 ChromeComponentExtensionResourceManager:: 25 ChromeComponentExtensionResourceManager::
26 ChromeComponentExtensionResourceManager() { 26 ChromeComponentExtensionResourceManager() {
27 static const GritResourceMap kExtraComponentExtensionResources[] = { 27 static const GritResourceMap kExtraComponentExtensionResources[] = {
28 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON}, 28 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON},
29 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16}, 29 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16},
30 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, 30 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 entries[i].name); 105 entries[i].name);
106 resource_path = resource_path.NormalizePathSeparators(); 106 resource_path = resource_path.NormalizePathSeparators();
107 107
108 DCHECK(path_to_resource_id_.find(resource_path) == 108 DCHECK(path_to_resource_id_.find(resource_path) ==
109 path_to_resource_id_.end()); 109 path_to_resource_id_.end());
110 path_to_resource_id_[resource_path] = entries[i].value; 110 path_to_resource_id_[resource_path] = entries[i].value;
111 } 111 }
112 } 112 }
113 113
114 } // namespace extensions 114 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/BUILD.gn ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698