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

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

Issue 14031009: Revert 194579 "Add a virtual keyboard webui at chrome://keyboard/" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | Annotate | Revision Log
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/keyboard_resources.h"
20 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
21 #include "skia/ext/image_operations.h" 20 #include "skia/ext/image_operations.h"
22 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/gfx/image/image_skia.h" 22 #include "ui/gfx/image/image_skia.h"
24 #include "webkit/glue/image_decoder.h" 23 #include "webkit/glue/image_decoder.h"
25 24
26 using content::BrowserThread; 25 using content::BrowserThread;
27 using extensions::Extension; 26 using extensions::Extension;
28 using extensions::ImageLoader; 27 using extensions::ImageLoader;
29 using extensions::Manifest; 28 using extensions::Manifest;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON}, 163 {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON},
165 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16}, 164 {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16},
166 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128}, 165 {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
167 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16}, 166 {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16},
168 #if defined(ENABLE_SETTINGS_APP) 167 #if defined(ENABLE_SETTINGS_APP)
169 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128}, 168 {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128},
170 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16}, 169 {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16},
171 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32}, 170 {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
172 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48}, 171 {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
173 #endif 172 #endif
174 #if defined(USE_AURA)
175 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
176 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
177 {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
178 {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS},
179 {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS},
180 {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON},
181 {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL},
182 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
183 {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
184 {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET},
185 {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN},
186 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
187 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
188 #endif
189 }; 173 };
190 static const size_t kExtraComponentExtensionResourcesSize = 174 static const size_t kExtraComponentExtensionResourcesSize =
191 arraysize(kExtraComponentExtensionResources); 175 arraysize(kExtraComponentExtensionResources);
192 176
193 base::FilePath directory_path = extension_path; 177 base::FilePath directory_path = extension_path;
194 base::FilePath resources_dir; 178 base::FilePath resources_dir;
195 base::FilePath relative_path; 179 base::FilePath relative_path;
196 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) || 180 if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
197 !resources_dir.AppendRelativePath(directory_path, &relative_path)) { 181 !resources_dir.AppendRelativePath(directory_path, &relative_path)) {
198 return false; 182 return false;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 gfx::Image image; 312 gfx::Image image;
329 if (!image_skia.isNull()) { 313 if (!image_skia.isNull()) {
330 image_skia.MakeThreadSafe(); 314 image_skia.MakeThreadSafe();
331 image = gfx::Image(image_skia); 315 image = gfx::Image(image_skia);
332 } 316 }
333 317
334 callback.Run(image); 318 callback.Run(image);
335 } 319 }
336 320
337 } // namespace extensions 321 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698