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

Unified Diff: chrome/common/extensions/manifest_url_handler.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
« no previous file with comments | « chrome/chrome_repack_resources.gypi ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/manifest_url_handler.cc
diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc
index 690cc03e21a78851a1062d0c9f856a2432708e61..20b399a81881ae1fe2e4abb5ef4b5224b662daa2 100644
--- a/chrome/common/extensions/manifest_url_handler.cc
+++ b/chrome/common/extensions/manifest_url_handler.cc
@@ -22,6 +22,10 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#if defined(USE_AURA)
+#include "ui/keyboard/keyboard_constants.h"
+#endif
+
namespace keys = extension_manifest_keys;
namespace errors = extension_manifest_errors;
@@ -276,6 +280,9 @@ bool URLOverridesHandler::Parse(Extension* extension, string16* error) {
!(extension->location() == Manifest::COMPONENT &&
page == chrome::kChromeUIFileManagerHost));
#endif
+#if defined(USE_AURA)
+ is_override = (is_override && page != keyboard::kKeyboardWebUIHost);
+#endif
if (is_override || !iter.value().GetAsString(&val)) {
*error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
« no previous file with comments | « chrome/chrome_repack_resources.gypi ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698