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

Unified Diff: trunk/src/chrome/common/extensions/manifest_url_handler.cc

Issue 14329004: Revert 194635 "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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/chrome_repack_resources.gypi ('k') | trunk/src/chrome/common/url_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/common/extensions/manifest_url_handler.cc
===================================================================
--- trunk/src/chrome/common/extensions/manifest_url_handler.cc (revision 194637)
+++ trunk/src/chrome/common/extensions/manifest_url_handler.cc (working copy)
@@ -22,10 +22,6 @@
#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;
@@ -280,9 +276,6 @@
!(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 | « trunk/src/chrome/chrome_repack_resources.gypi ('k') | trunk/src/chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698