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

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

Issue 15176004: Web Component Virtual Keyboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/keyboard/keyboard_resources.grd » ('j') | ui/keyboard/resources/api_adapter.js » ('J')
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/browser/extensions/image_loader.h" 5 #include "chrome/browser/extensions/image_loader.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, 167 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
168 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, 168 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16},
169 #if defined(ENABLE_SETTINGS_APP) 169 #if defined(ENABLE_SETTINGS_APP)
170 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128}, 170 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128},
171 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16}, 171 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16},
172 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32}, 172 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
173 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48}, 173 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
174 #endif 174 #endif
175 #if defined(USE_AURA) 175 #if defined(USE_AURA)
176 {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS}, 176 {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS},
177 {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS}, 177 {"keyboard/constants.js", IDR_KEYBOARD_CONSTANTS_JS},
178 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON}, 178 {"keyboard/elements/kb-key.html", IDR_KEYBOARD_ELEMENTS_KEY},
179 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL}, 179 {"keyboard/elements/kb-keyboard.html", IDR_KEYBOARD_ELEMENTS_KEYBOARD},
180 {"keyboard/elements/kb-keyset.html", IDR_KEYBOARD_ELEMENTS_KEYSET},
181 {"keyboard/elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW},
180 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 182 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
181 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC}, 183 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
182 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET}, 184 {"keyboard/images/mic-green.svg", IDR_KEYBOARD_IMAGES_MIC_GREEN},
183 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
184 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN},
185 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
186 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 185 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
187 {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS}, 186 {"keyboard/keysets.html", IDR_KEYBOARD_KEYSETS},
188 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, 187 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
189 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS}, 188 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
189 {"keyboard/polymer.min.js", IDR_KEYBOARD_POLYMER},
190 {"keyboard/voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS},
190 #endif 191 #endif
191 }; 192 };
192 static const size_t kExtraComponentExtensionResourcesSize = 193 static const size_t kExtraComponentExtensionResourcesSize =
193 arraysize(kExtraComponentExtensionResources); 194 arraysize(kExtraComponentExtensionResources);
194 195
195 base::FilePath directory_path = extension_path; 196 base::FilePath directory_path = extension_path;
196 base::FilePath resources_dir; 197 base::FilePath resources_dir;
197 base::FilePath relative_path; 198 base::FilePath relative_path;
198 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) || 199 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
199 !resources_dir.AppendRelativePath(directory_path, &relative_path)) { 200 !resources_dir.AppendRelativePath(directory_path, &relative_path)) {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 gfx::Image image; 331 gfx::Image image;
331 if (!image_skia.isNull()) { 332 if (!image_skia.isNull()) {
332 image_skia.MakeThreadSafe(); 333 image_skia.MakeThreadSafe();
333 image = gfx::Image(image_skia); 334 image = gfx::Image(image_skia);
334 } 335 }
335 336
336 callback.Run(image); 337 callback.Run(image);
337 } 338 }
338 339
339 } // namespace extensions 340 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | ui/keyboard/keyboard_resources.grd » ('j') | ui/keyboard/resources/api_adapter.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698