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

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

Issue 13652010: Add a virtual keyboard webui at chrome://keyboard/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 7 years, 8 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
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"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/threading/sequenced_worker_pool.h" 12 #include "base/threading/sequenced_worker_pool.h"
13 #include "chrome/browser/extensions/image_loader_factory.h" 13 #include "chrome/browser/extensions/image_loader_factory.h"
14 #include "chrome/common/chrome_paths.h" 14 #include "chrome/common/chrome_paths.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "grit/chrome_unscaled_resources.h" 17 #include "grit/chrome_unscaled_resources.h"
18 #include "grit/component_extension_resources_map.h" 18 #include "grit/component_extension_resources_map.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "skia/ext/image_operations.h" 20 #include "skia/ext/image_operations.h"
21 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/gfx/image/image_skia.h" 22 #include "ui/gfx/image/image_skia.h"
23 #include "webkit/glue/image_decoder.h" 23 #include "webkit/glue/image_decoder.h"
24 24
25 #if defined(USE_AURA)
26 #include "grit/keyboard_resources.h"
27 #endif
28
25 using content::BrowserThread; 29 using content::BrowserThread;
26 using extensions::Extension; 30 using extensions::Extension;
27 using extensions::ImageLoader; 31 using extensions::ImageLoader;
28 using extensions::Manifest; 32 using extensions::Manifest;
29 33
30 namespace { 34 namespace {
31 35
32 bool ShouldResizeImageRepresentation( 36 bool ShouldResizeImageRepresentation(
33 ImageLoader::ImageRepresentation::ResizeCondition resize_method, 37 ImageLoader::ImageRepresentation::ResizeCondition resize_method,
34 const gfx::Size& decoded_size, 38 const gfx::Size& decoded_size,
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON}, 167 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON},
164 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16}, 168 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16},
165 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, 169 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
166 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, 170 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16},
167 #if defined(ENABLE_SETTINGS_APP) 171 #if defined(ENABLE_SETTINGS_APP)
168 {"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},
169 {"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},
170 {"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},
171 {"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},
172 #endif 176 #endif
177 #if defined(USE_AURA)
178 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
179 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
180 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
181 {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS},
182 {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS},
183 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON},
184 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL},
185 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
186 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
187 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET},
188 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN},
189 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
190 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
191 #endif
173 }; 192 };
174 static const size_t kExtraComponentExtensionResourcesSize = 193 static const size_t kExtraComponentExtensionResourcesSize =
175 arraysize(kExtraComponentExtensionResources); 194 arraysize(kExtraComponentExtensionResources);
176 195
177 base::FilePath directory_path = extension_path; 196 base::FilePath directory_path = extension_path;
178 base::FilePath resources_dir; 197 base::FilePath resources_dir;
179 base::FilePath relative_path; 198 base::FilePath relative_path;
180 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) || 199 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
181 !resources_dir.AppendRelativePath(directory_path, &relative_path)) { 200 !resources_dir.AppendRelativePath(directory_path, &relative_path)) {
182 return false; 201 return false;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 gfx::Image image; 331 gfx::Image image;
313 if (!image_skia.isNull()) { 332 if (!image_skia.isNull()) {
314 image_skia.MakeThreadSafe(); 333 image_skia.MakeThreadSafe();
315 image = gfx::Image(image_skia); 334 image = gfx::Image(image_skia);
316 } 335 }
317 336
318 callback.Run(image); 337 callback.Run(image);
319 } 338 }
320 339
321 } // namespace extensions 340 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698