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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/image_loader.cc
diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc
index cc3d4354596818f2cfaba6cdf7ee81dc88413533..69cffcbdb3a5e097987e0013147d00c626b963cb 100644
--- a/chrome/browser/extensions/image_loader.cc
+++ b/chrome/browser/extensions/image_loader.cc
@@ -22,6 +22,10 @@
#include "ui/gfx/image/image_skia.h"
#include "webkit/glue/image_decoder.h"
+#if defined(USE_AURA)
+#include "grit/keyboard_resources.h"
+#endif
+
using content::BrowserThread;
using extensions::Extension;
using extensions::ImageLoader;
@@ -170,6 +174,21 @@ bool ImageLoader::IsComponentExtensionResource(
{"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
{"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
#endif
+#if defined(USE_AURA)
+ {"keyboard/index.html", IDR_KEYBOARD_INDEX},
+ {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
+ {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS},
+ {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS},
+ {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS},
+ {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON},
+ {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL},
+ {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
+ {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC},
+ {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET},
+ {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN},
+ {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
+ {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB},
+#endif
};
static const size_t kExtraComponentExtensionResourcesSize =
arraysize(kExtraComponentExtensionResources);
« 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