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

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: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/keyboard/keyboard_resources.grd » ('j') | ui/keyboard/keyboard_resources.grd » ('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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, 169 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
170 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, 170 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16},
171 #if defined(ENABLE_SETTINGS_APP) 171 #if defined(ENABLE_SETTINGS_APP)
172 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128}, 172 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128},
173 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16}, 173 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16},
174 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32}, 174 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
175 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48}, 175 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
176 #endif 176 #endif
177 #if defined(USE_AURA) 177 #if defined(USE_AURA)
178 {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS}, 178 {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS},
179 {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS}, 179 {"keyboard/voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS},
bryeung 2013/05/23 21:39:28 alphabetical order please...
bshe 2013/05/24 14:43:50 Done.
180 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON}, 180 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON},
181 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL}, 181 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL},
182 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 182 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
183 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC}, 183 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
184 {"keyboard/images/mic-green.svg", IDR_KEYBOARD_IMAGES_MIC_GREEN},
184 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET}, 185 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET},
185 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, 186 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
186 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN}, 187 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN},
187 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB}, 188 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
188 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 189 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
189 {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS},
190 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, 190 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
191 {"keyboard/constants.js", IDR_KEYBOARD_CONSTANTS_JS},
191 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS}, 192 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
193 {"keyboard/polymer.min.js", IDR_KEYBOARD_POLYMER},
194 {"keyboard/keysets.html", IDR_KEYBOARD_KEYSETS},
195 {"keyboard/elements/kb-key.html", IDR_KEYBOARD_ELEMENTS_KEY},
196 {"keyboard/elements/kb-keyboard.html", IDR_KEYBOARD_ELEMENTS_KEYBOARD},
197 {"keyboard/elements/kb-keyset.html", IDR_KEYBOARD_ELEMENTS_KEYSET},
198 {"keyboard/elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW},
192 #endif 199 #endif
193 }; 200 };
194 static const size_t kExtraComponentExtensionResourcesSize = 201 static const size_t kExtraComponentExtensionResourcesSize =
195 arraysize(kExtraComponentExtensionResources); 202 arraysize(kExtraComponentExtensionResources);
196 203
197 base::FilePath directory_path = extension_path; 204 base::FilePath directory_path = extension_path;
198 base::FilePath resources_dir; 205 base::FilePath resources_dir;
199 base::FilePath relative_path; 206 base::FilePath relative_path;
200 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) || 207 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
201 !resources_dir.AppendRelativePath(directory_path, &relative_path)) { 208 !resources_dir.AppendRelativePath(directory_path, &relative_path)) {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 gfx::Image image; 339 gfx::Image image;
333 if (!image_skia.isNull()) { 340 if (!image_skia.isNull()) {
334 image_skia.MakeThreadSafe(); 341 image_skia.MakeThreadSafe();
335 image = gfx::Image(image_skia); 342 image = gfx::Image(image_skia);
336 } 343 }
337 344
338 callback.Run(image); 345 callback.Run(image);
339 } 346 }
340 347
341 } // namespace extensions 348 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | ui/keyboard/keyboard_resources.grd » ('j') | ui/keyboard/keyboard_resources.grd » ('J')

Powered by Google App Engine
This is Rietveld 408576698