trunk/src/chrome/browser/extensions/image_loader.cc - Issue 14329004: Revert 194635 "Add a virtual keyboard webui at chrome://keyboard/"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/extensions/image_loader.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/browser/extensions/component_loader.cc ('k') | trunk/src/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/extensions/image_loader.cc

===================================================================

--- trunk/src/chrome/browser/extensions/image_loader.cc (revision 194637)

+++ trunk/src/chrome/browser/extensions/image_loader.cc (working copy)

@@ -16,17 +16,12 @@

#include "content/public/browser/browser_thread.h"

#include "grit/chrome_unscaled_resources.h"

#include "grit/component_extension_resources_map.h"

-#include "grit/keyboard_resources.h"

#include "grit/theme_resources.h"

#include "skia/ext/image_operations.h"

#include "ui/base/resource/resource_bundle.h"

#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;

@@ -175,21 +170,6 @@

{"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);