chrome/browser/views/dropdown_bar_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/views/dropdown_bar_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

« no previous file with comments | « chrome/browser/views/browser_keyboard_accessibility_test_win.cc ('k') | chrome/browser/views/extensions/extension_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/views/dropdown_bar_host.cc

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

--- chrome/browser/views/dropdown_bar_host.cc (revision 58386)

+++ chrome/browser/views/dropdown_bar_host.cc (working copy)

@@ -4,8 +4,8 @@

#include "chrome/browser/views/dropdown_bar_host.h"

+#include "app/keyboard_codes.h"

#include "app/slide_animation.h"

-#include "base/keyboard_codes.h"

#include "base/scoped_handle.h"

#include "chrome/browser/browser.h"

#include "chrome/browser/browser_process.h"

@@ -297,14 +297,14 @@

void DropdownBarHost::RegisterAccelerators() {

DCHECK(!esc_accel_target_registered_);

- views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);

+ views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);

focus_manager_->RegisterAccelerator(escape, this);

esc_accel_target_registered_ = true;

}

void DropdownBarHost::UnregisterAccelerators() {

DCHECK(esc_accel_target_registered_);

- views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);

+ views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);

focus_manager_->UnregisterAccelerator(escape, this);

esc_accel_target_registered_ = false;

}