| OLD | NEW |
| 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 Loading... |
| 169 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16}, | 169 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16}, |
| 170 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, | 170 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, |
| 171 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, | 171 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, |
| 172 #if defined(ENABLE_SETTINGS_APP) | 172 #if defined(ENABLE_SETTINGS_APP) |
| 173 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128}, | 173 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128}, |
| 174 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16}, | 174 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16}, |
| 175 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32}, | 175 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32}, |
| 176 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48}, | 176 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48}, |
| 177 #endif | 177 #endif |
| 178 #if defined(USE_AURA) | 178 #if defined(USE_AURA) |
| 179 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, | |
| 180 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, | |
| 181 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS}, | |
| 182 {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS}, | 179 {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS}, |
| 183 {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS}, | |
| 184 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON}, | 180 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON}, |
| 185 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL}, | 181 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL}, |
| 186 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, | 182 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, |
| 187 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC}, | 183 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC}, |
| 188 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET}, | 184 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET}, |
| 185 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, |
| 189 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN}, | 186 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN}, |
| 190 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, | |
| 191 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB}, | 187 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB}, |
| 188 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, |
| 189 {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS}, |
| 190 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, |
| 191 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS}, |
| 192 {"keyboard/send_key_event.js", IDR_KEYBOARD_SEND_KEY_EVENT_JS}, |
| 192 #endif | 193 #endif |
| 193 }; | 194 }; |
| 194 static const size_t kExtraComponentExtensionResourcesSize = | 195 static const size_t kExtraComponentExtensionResourcesSize = |
| 195 arraysize(kExtraComponentExtensionResources); | 196 arraysize(kExtraComponentExtensionResources); |
| 196 | 197 |
| 197 base::FilePath directory_path = extension_path; | 198 base::FilePath directory_path = extension_path; |
| 198 base::FilePath resources_dir; | 199 base::FilePath resources_dir; |
| 199 base::FilePath relative_path; | 200 base::FilePath relative_path; |
| 200 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) || | 201 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) || |
| 201 !resources_dir.AppendRelativePath(directory_path, &relative_path)) { | 202 !resources_dir.AppendRelativePath(directory_path, &relative_path)) { |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 gfx::Image image; | 333 gfx::Image image; |
| 333 if (!image_skia.isNull()) { | 334 if (!image_skia.isNull()) { |
| 334 image_skia.MakeThreadSafe(); | 335 image_skia.MakeThreadSafe(); |
| 335 image = gfx::Image(image_skia); | 336 image = gfx::Image(image_skia); |
| 336 } | 337 } |
| 337 | 338 |
| 338 callback.Run(image); | 339 callback.Run(image); |
| 339 } | 340 } |
| 340 | 341 |
| 341 } // namespace extensions | 342 } // namespace extensions |
| OLD | NEW |