chrome/browser/extensions/extension_host.cc - Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

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: chrome/browser/extensions/extension_host.cc

Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 4 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/extension_host.cc

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

--- chrome/browser/extensions/extension_host.cc (revision 58386)

+++ chrome/browser/extensions/extension_host.cc (working copy)

@@ -6,9 +6,9 @@

#include <list>

+#include "app/keyboard_codes.h"

#include "app/l10n_util.h"

#include "app/resource_bundle.h"

-#include "base/keyboard_codes.h"

#include "base/message_loop.h"

#include "base/singleton.h"

#include "base/string_util.h"

@@ -627,7 +627,7 @@

bool* is_keyboard_shortcut) {

if (extension_host_type_ == ViewType::EXTENSION_POPUP &&

event.type == NativeWebKeyboardEvent::RawKeyDown &&

- event.windowsKeyCode == base::VKEY_ESCAPE) {

+ event.windowsKeyCode == app::VKEY_ESCAPE) {

DCHECK(is_keyboard_shortcut != NULL);

*is_keyboard_shortcut = true;

}

@@ -637,7 +637,7 @@

void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {

if (extension_host_type_ == ViewType::EXTENSION_POPUP) {

if (event.type == NativeWebKeyboardEvent::RawKeyDown &&

- event.windowsKeyCode == base::VKEY_ESCAPE) {

+ event.windowsKeyCode == app::VKEY_ESCAPE) {

NotificationService::current()->Notify(

NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,

Source<Profile>(profile_),

« no previous file with comments | « chrome/browser/cocoa/html_dialog_window_controller.mm ('k') | chrome/browser/extensions/extension_input_api.cc » ('j') | no next file with comments »