| Index: trunk/src/chrome/common/extensions/manifest_url_handler.cc
|
| ===================================================================
|
| --- trunk/src/chrome/common/extensions/manifest_url_handler.cc (revision 194584)
|
| +++ 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);
|
|
|